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>2020-01-19 06:25:56 +0300
committerNextcloud bot <bot@nextcloud.com>2020-01-19 06:25:56 +0300
commitf4febe04bc63537429d4de952c3119973d90bc2f (patch)
tree6be9e7cd57ac6d28096792fbb54cca7dce0a2069
parentc2f5f156f0fd525fdcf4e6bd400c0f0fccac9898 (diff)
[tx-robot] updated from transifex
-rw-r--r--.tx/nextcloud.client-desktop/cs_translation2
-rw-r--r--.tx/nextcloud.client-desktop/de_translation8
-rw-r--r--translations/client_bg.ts503
-rw-r--r--translations/client_ca.ts505
-rw-r--r--translations/client_cs.ts511
-rw-r--r--translations/client_da.ts501
-rw-r--r--translations/client_de.ts505
-rw-r--r--translations/client_el.ts505
-rw-r--r--translations/client_en.ts491
-rw-r--r--translations/client_en_GB.ts503
-rw-r--r--translations/client_eo.ts505
-rw-r--r--translations/client_es.ts505
-rw-r--r--translations/client_es_AR.ts503
-rw-r--r--translations/client_es_CL.ts503
-rw-r--r--translations/client_es_CO.ts503
-rw-r--r--translations/client_es_CR.ts503
-rw-r--r--translations/client_es_DO.ts503
-rw-r--r--translations/client_es_EC.ts503
-rw-r--r--translations/client_es_GT.ts503
-rw-r--r--translations/client_es_HN.ts503
-rw-r--r--translations/client_es_MX.ts503
-rw-r--r--translations/client_es_SV.ts503
-rw-r--r--translations/client_et.ts503
-rw-r--r--translations/client_eu.ts505
-rw-r--r--translations/client_fa.ts505
-rw-r--r--translations/client_fi.ts503
-rw-r--r--translations/client_fr.ts505
-rw-r--r--translations/client_gl.ts505
-rw-r--r--translations/client_he.ts505
-rw-r--r--translations/client_hr.ts505
-rw-r--r--translations/client_hu.ts505
-rw-r--r--translations/client_id.ts493
-rw-r--r--translations/client_is.ts505
-rw-r--r--translations/client_it.ts505
-rw-r--r--translations/client_ja.ts505
-rw-r--r--translations/client_ko.ts505
-rw-r--r--translations/client_lt_LT.ts505
-rw-r--r--translations/client_lv.ts505
-rw-r--r--translations/client_nb_NO.ts505
-rw-r--r--translations/client_nl.ts505
-rw-r--r--translations/client_pl.ts505
-rw-r--r--translations/client_pt.ts505
-rw-r--r--translations/client_pt_BR.ts505
-rw-r--r--translations/client_ro.ts503
-rw-r--r--translations/client_ru.ts505
-rw-r--r--translations/client_sk.ts505
-rw-r--r--translations/client_sl.ts505
-rw-r--r--translations/client_sr.ts505
-rw-r--r--translations/client_sv.ts505
-rw-r--r--translations/client_th.ts503
-rw-r--r--translations/client_tr.ts505
-rw-r--r--translations/client_uk.ts503
-rw-r--r--translations/client_zh_CN.ts505
-rw-r--r--translations/client_zh_TW.ts505
54 files changed, 9128 insertions, 17084 deletions
diff --git a/.tx/nextcloud.client-desktop/cs_translation b/.tx/nextcloud.client-desktop/cs_translation
index 6dcee61e5..1161f110e 100644
--- a/.tx/nextcloud.client-desktop/cs_translation
+++ b/.tx/nextcloud.client-desktop/cs_translation
@@ -198,7 +198,7 @@ X-GNOME-Autostart-Delay=3
# Translations
-Icon[cs_CZ]=@NAZEV_IKONY_APLIKACE@
+Icon[cs_CZ]=@APPLICATION_ICON_NAME@
Name[cs_CZ]=@APPLICATION_NAME@ synchronizační klient pro desktop
Comment[cs_CZ]=@APPLICATION_NAME@ synchronizační klient pro desktop
GenericName[cs_CZ]=Synchronizace složek
diff --git a/.tx/nextcloud.client-desktop/de_translation b/.tx/nextcloud.client-desktop/de_translation
index e3d9ad406..09564e030 100644
--- a/.tx/nextcloud.client-desktop/de_translation
+++ b/.tx/nextcloud.client-desktop/de_translation
@@ -198,7 +198,7 @@ X-GNOME-Autostart-Delay=3
# Translations
-Icon[de]=@APPLICATION_ICON_NAME@
-Name[de]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation
-Comment[de]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation
-GenericName[de]=Synchronisationsordner
+Icon[de_DE]=@APPLICATION_ICON_NAME@
+Name[de_DE]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation
+Comment[de_DE]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation
+GenericName[de_DE]=Synchronisationsordner
diff --git a/translations/client_bg.ts b/translations/client_bg.ts
index cb543917e..1055a27f9 100644
--- a/translations/client_bg.ts
+++ b/translations/client_bg.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>Дисково пространство: ...</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>Отказ</translation>
</message>
@@ -242,230 +242,199 @@
<translation>Свързан с &lt;server&gt;, като &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>Няма настроен профил.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>Добави нов</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>Премахни</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>Профил</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>Избор на елементи за синхронизиране</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>Синхронизирай сега</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>Рестартирай синхронизирането</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>Премахни синхронизирането</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>Създаването на папката се провали</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Потвърждаване за премахване на синхронизация</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>Премахни</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>Синхронизират се файлове</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>В момента се извършва синхронизиране.&lt;br/&gt;Да бъде ли прекратено?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>Ползвате %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 като &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>Сървърът е версия %1 - стара и неподдържана! Можете .</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>Осъществена връзка с %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Сървърът %1 е временно недостъпен.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Сървърът %1 е в режим на поддръжка.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>Отписан от %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Извършва се оторизация от браузъра. &lt;a href=&apos;%1&apos;&gt;Кликнете тук&lt;/a&gt; за да отворите отново браузъра.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>Не може да се осъществи връзка като %1 с %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>Вписване</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Някои папки не са синхронизирани защото са твърде големи:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Има папки, които не са синхронизирани защото са външни хранилища:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Има папки, които не са синхронизирани защото са твърде големи или са външни хранилища:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Потвърждение за премахване на профил</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Наистина ли желаете да премахнете връзката към профила &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Бележка:&lt;/b&gt; Дейтствието &lt;b&gt;няма&lt;/b&gt; да предизвика изтриване на файлове.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>Премахни връзката</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>Отвори папката</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>Отписване</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>Продължи синхронизирането</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>Пауза</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Наистина ли желаете да премахнете синхронизирането на папката&lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Бележка:&lt;/b&gt; Действието &lt;b&gt;няма&lt;/b&gt; да предизвика изтриване на файлове.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>Ползвате %1 (%3%) от %2. Някои папки, включително монтирани по мрежата или споделени може да имат различни лимити.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>Ползвате %1 от %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>В момента няма достъпна информация за използването на хранилището.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>Няма %1 конфигурирана връзка.</translation>
</message>
@@ -473,102 +442,61 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>Отписан</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>Без връзка</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>Свързан</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>Услугата не е налична</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>Режим на поддръжка</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>Мрежова грешка</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>Грешка с конфигурацията</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>Въведете потребителска информация за вход</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>Непознато състояние на профила</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation>Още информация</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation>Приемане</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation>Влез</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation>Приемане</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation type="unfinished"/>
- </message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
</context>
@@ -680,12 +608,12 @@
<translation>Няма конфигуриран ownCloud профил</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>Конфигурирания сървър за този клиент е прекалено стар</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Моля, обновете до по-нов сървър и рестартирайте клиента</translation>
</message>
@@ -901,36 +829,36 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Добавена е нова папка по-голяма от %1 MB: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>Добавена е папка от външно хранилище.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Моля, отидете в настройки, ако желаете да го свалите.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -939,7 +867,7 @@ This means that the synchronization client might not upload local changes immedi
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -947,46 +875,46 @@ If you decide to delete the files, they will be unavailable to you, unless you a
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation>Изтрий файловете?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation>Изтрий файловете</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation>Възстанови изтритите файлове</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>Засечено е резервно копие</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>Нормално синхронизиране</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@@ -1473,22 +1401,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2619,7 +2547,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>Отхвърли</translation>
</message>
@@ -2632,22 +2560,17 @@ It is not advisable to use it.</source>
<translation>Настройки</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>Активност</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>Общи</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>Мрежа</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>Профил</translation>
</message>
@@ -2893,60 +2816,54 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation>Споделих нещо с вас</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation>Отвори в браузъра</translation>
</message>
@@ -3432,7 +3349,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3440,17 +3357,68 @@ It is not advisable to use it.</source>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3487,234 +3455,113 @@ It is not advisable to use it.</source>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>Моля, впишете се</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>Папка %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>Няма папки за синхронизиране.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>Отвори в браузъра</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>Отписване</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>Последни промени</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>Отвори папката &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>Отвори %1 в браузъра</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>Помощ</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation>Версията на сървъра не се поддържа</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>Профил %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>Отписан</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>Синхронизирането е изключно</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>Синхронизирането е на пауза</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation>Неразрешени конфликти</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>Грешка при синхронизирането</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation>Няма настроени папки за синхронизиране</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation>Продължи всички синхронизирания</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation>Продължи синхронизирането</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>Пауза за всички синхронизирания</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>Пауза за синхронизирането</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation>Приложения</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>Скоро не са синхронизирани файлове</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation>Проверка за отдалечени промени в &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation>Проверка за локални промени в &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation>Синхронизиране на %1 от %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>Синхронизиране на %1 (остават %2)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>Синхронизиране на %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation type="unfinished"/>
</message>
@@ -3986,7 +3833,7 @@ It is not advisable to use it.</source>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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_ca.ts b/translations/client_ca.ts
index 2caa6cccd..b853615b6 100644
--- a/translations/client_ca.ts
+++ b/translations/client_ca.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>Espai d&apos;emmagatzematge: ...</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>Cancel·la</translation>
</message>
@@ -242,230 +242,199 @@
<translation>Connectat amb &lt;server&gt; com a &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>No hi ha cap compte configurat.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>Afegeix-ne un de nou</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>Suprimeix</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>Compte</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation>Aquest compte suporta xifratge d&apos;extrem a extrem</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation>Activa el xifratge</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation>Mostra la mnemotècnica Punt-a-Punt</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation>Xifra</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation>Edita els fitxers ignorats</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>Trieu què voleu sincronitzar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>Força la sincronització ara</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>Reinicia la sincronització</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>Suprimeix la connexió de la carpeta sincronitzada</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>Ha fallat la creació de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Confirmeu la supressió de la connexió de la carpeta sincronitzada</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>Suprimeix la connexió de la carpeta sincronitzada</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>S&apos;està sincronitzant</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>S&apos;està sincronitzant.&lt;br/&gt;Voleu aturar-ho?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 en ús</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 com a &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>La versió del servidor %1 és antiga i fora de suport! Continueu sota la vostra responsabilitat.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>Connectat a %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>El servidor %1 no està temporalment disponible</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>El servidor %1 es troba en mode de manteniment.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>S&apos;ha desconnectat de %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>S&apos;està obtenint autorització des del navegador. &lt;a href=&apos;%1&apos;&gt;feu clic aquí&lt;/a&gt; per tornar a obrir el navegador.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>No hi ha connexió amb %1 a %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>Inici de sessió</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Hi ha carpetes que no s&apos;han sincronitzat perquè són massa grans:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Hi ha carpetes que no s&apos;han sincronitzat perquè són fonts d&apos;emmagatzematge externes:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Hi ha carpetes que no s&apos;han sincronitzat perquè són massa grans o són fonts d&apos;emmagatzematge externes:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Confirmeu la supressió del compte</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<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/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>Suprimeix la connexió</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>Obre la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>Surt</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>Continua la sincronització</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>Pausa la sincronització</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Segur que voleu aturar la sincronització de la carpeta &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; això &lt;b&gt;no&lt;/b&gt; suprimirà cap fitxer.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) de %2 en ús. Algunes carpetes, incloent les carpetes muntades a través de xarxa o les compartides, poden tenir límits diferents.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>%1 de %2 en ús</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualment no hi ha informació disponible de l&apos;ús d&apos;emmagatzematge.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>La connexió %1 no està configurada.</translation>
</message>
@@ -473,103 +442,62 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>S&apos;ha desconnectat</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>Desconnectat</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>Connectat</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>Servei no disponible</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>Mode de manteniment</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>Error de xarxa</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>Error de configuració</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>S&apos;estan demanant les credencials</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>Estat del compte desconegut</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation>Més informació</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation>Accepta</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation>Uneix</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation>Obre el navegador</translation>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation>Els arxius de la llista d&apos;ignorats així com els enllaços simbòlics, no se sincronitzen. Això inclou:</translation>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation>Accepta</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
- <translation>S&apos;ha sincronitzat</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation>Torna a intentar totes les pujades</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br/&gt;El compte %1 no té les activitats habilitades.</translation>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -680,12 +608,12 @@
<translation>No hi ha cap compte configurat d&apos;OwnCloud</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>El servidor configurat per aquest client és massa antic</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Actualitzeu el servidor a l&apos;última versió i reestabliu el client.</translation>
</message>
@@ -903,36 +831,36 @@ Consulteu el registre per obtenir més informació.</numerusform></translation>
<translation>No s&apos;ha pogut llegir el fitxer d&apos;exclusió del sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>S&apos;ha afegit una carpeta de més de %1 MB: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>S&apos;ha afegit una carpeta d&apos;una font d&apos;emmagatzematge extern.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Si us plau aneu al paràmetres per seleccionar si voleu descarregar-ho</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>La carpeta %1 es va crear, però es va excloure de la sincronització anteriorment. Les dades que hi ha dins no es sincronitzaran.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>El fitxer %1 es va crear, però es va excloure de la sincronització anteriorment. No es sincronitzarà.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -945,7 +873,7 @@ Això significa que és possible que el client de sincronització no pugui carre
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -956,7 +884,7 @@ Si decidiu restaurar els fitxers, es tornaran a sincronitzar amb el servidor si
Si decidiu suprimir els fitxers, no estaran disponibles, tret que en sigueu el propietari.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
@@ -965,22 +893,22 @@ Aquests fitxers se suprimiran del servidor i no estaran disponibles als altres d
Si aquesta acció no era desitjada, podeu restaurar les dades perdudes ara.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation>Voleu suprimir tots els fitxers?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation>Suprimeix tots els fitxers</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation>Restaura els fitxers suprimits</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -989,17 +917,17 @@ Això pot ser per què es va restablir una còpia de seguretat al servidor.
Continuar la sincronització com a normal farà que tots els vostres fitxers siguin sobreescrits per un fitxer anterior en un estat anterior. Voleu mantenir els fitxers locals més recents com a fitxers de conflicte?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>Còpia de seguretat detectada</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>Sincronització normal</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>Manté els fitxers locals com a conflicte</translation>
</message>
@@ -1486,22 +1414,22 @@ Continuar la sincronització com a normal farà que tots els vostres fitxers sig
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation>Error de compartició</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2639,7 +2567,7 @@ No és aconsellable fer-la servir.</translation>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>Descarta</translation>
</message>
@@ -2652,22 +2580,17 @@ No és aconsellable fer-la servir.</translation>
<translation>Paràmetres</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>Activitat</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>General</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>Xarxa</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>Compte</translation>
</message>
@@ -2913,60 +2836,54 @@ No és aconsellable fer-la servir.</translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation>Comparteix amb %1</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation>Comparteix el menú contextual</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation>He compartit una cosa amb tu</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation>Opcions de compartició</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation>Copia l&apos;enllaç privat al porta-retalls</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation>No es permet re-compartir el fitxer</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation>Copia l&apos;enllaç públic</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation>Copia l&apos;enllaç intern</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation>Obre-ho al navegador</translation>
</message>
@@ -3453,7 +3370,7 @@ No és aconsellable fer-la servir.</translation>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3461,17 +3378,68 @@ No és aconsellable fer-la servir.</translation>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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 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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>&lt;p&gt;Aquest llançament va ser subministrat per %1&lt;/p&gt;</translation>
</message>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3508,234 +3476,113 @@ No és aconsellable fer-la servir.</translation>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>Acrediteu-vos</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>Carpeta %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>No hi han carpetes sincronitzades configurades.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>Obre al navegador</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>Surt</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>Canvis recents</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>Fitxers gestionats:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>Obre la carpeta &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>Obre %1 en el navegador</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>Estat desconegut</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>Ajuda</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>Surt %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation>S&apos;ha desconnectat de %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation>La versió del servidor no és compatible</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>El servidor del compte %1 fa servir la versió antiga %2 antiga i no és compatible. Fer servir aquest client amb versions no compatibles del servidor no s&apos;ha provat i pot ser potencialment perillós. Procediu sota la vostra responsabilitat.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>Desconnectat</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation>Desconnectat d&apos;alguns comptes</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>Desconnectat dels comptes:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>Compte %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>S&apos;ha desconnectat</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>La sincronització del compte està deshabilitada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>S&apos;ha pausat la sincronització</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation>Conflictes no resolts</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>S&apos;ha produït un error durant la sincronització</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation>No s’han configurat carpetes de sincronització</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation>Reprèn totes les carpetes</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>Pausa totes les carpetes</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation>Reprèn totes les sincronitzacions</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation>Reprèn la sincronització</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>Pausa totes les sincronitzacions</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>Pausa la sincronització</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation>Fallada ara</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation>Aplicacions</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>No hi ha cap element sincronitzat recentment</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation>S&apos;estan comprovant canvis al control remot &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation>S&apos;estan comprovant els canvis en local &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation>S&apos;està sincronitzant %1 de %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>S&apos;està sincronitzant %1 (%2 pendents)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>S&apos;està sincronitzant %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>Actualitzat</translation>
</message>
@@ -4007,7 +3854,7 @@ No és aconsellable fer-la servir.</translation>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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ït a partir de la revisió Git &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; el %3, %4 fent servir Qt %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
</message>
diff --git a/translations/client_cs.ts b/translations/client_cs.ts
index b2108eabb..af920cfb9 100644
--- a/translations/client_cs.ts
+++ b/translations/client_cs.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>Prostor úložiště: …</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>Storno</translation>
</message>
@@ -242,230 +242,199 @@
<translation>Připojen k &lt;server&gt; jako &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>Nenastaven žádný účet.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>Přidat nový</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>Odebrat</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>Účet</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation>Tento účet podporuje šifrování end-to-end</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation>Zapnout šifrování</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation>Zobrazit E2E mnemotechnickou</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation>Šífrovat</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation>Upravit ignorované soubory</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>Vybrat co sesynchronizovat</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>Vynutit synchronizaci nyní</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>Restartovat synchronizaci</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>Odstranit připojení synchronizace složky</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>Vytvoření složky se nezdařilo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Potvrdit odstranění připojení synchronizace složky</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>Odstranit připojení synchronizace složky</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>Synchronizace probíhá</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Operace synchronizace právě probíhá.&lt;br/&gt;Přejete si ji ukončit?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 používaný</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 jako &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>Server verze %1 je zastaralý a nepodporovaný! Pokračujte na vlastní riziko.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>Připojeno k %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Server %1 je dočasně nedostupný.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Na serveru %1 v tuto chvíli probíhá údržba.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>Odhlášeno z %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Získávání pověření z prohlížeče. &lt;a href=&apos;%1&apos;&gt;Klikněte sem&lt;/a&gt; pro opětovné otevření prohlížeče.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>Bez připojení k %1 na %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>Přihlásit</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Tyto složky nebyly synchronizovány, protože jsou příliš velké:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Tyto složky nebyly synchronizovány, protože se nacházejí na externích úložištích:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Tyto složky nebyly synchronizovány, protože jsou příliš velké, nebo se nacházejí na externích úložištích:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Potvrdit odstranění účtu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Opravdu chcete odstranit připojení k účtu &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Poznámka:&lt;/b&gt; Toto &lt;b&gt;neodstraní&lt;/b&gt; žádné soubory.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>Odstranit připojení</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>Otevřít složku</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>Odhlásit se</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>Pokračovat v synchronizaci</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>Pozastavit synchronizaci</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;Nedaří se vytvořit místní složku &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Opravdu chcete zastavit synchronizaci složky &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Poznámka:&lt;/b&gt; Toto &lt;b&gt;neodstraní&lt;/b&gt; žádné soubory.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>Používaných %1 (%3%) z %2. Některé složky včetně připojených síťových nebo sdílených složek mohou mít odlišné limity.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>Používaných %1 z %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>Momentálně nejsou k dispozici žádné informace o využití úložiště.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation>Připojování k %1…</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>Nenastaveno žádné spojení s %1.</translation>
</message>
@@ -473,103 +442,62 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>Odhlášeno</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>Odpojeno</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>Připojeno</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>Služba nedostupná</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>Režim údržby</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>Chyba sítě</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
- <translation>Chyba nastavení</translation>
+ <translation>Chyba v nastavení</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>Dotazování na přihlašovací údaje</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>Neznámý stav účtu</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation>Více informací</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation>Přijmout</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation>Připojit se</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation>Otevřít prohlížeč</translation>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation>Soubory ze seznamu ignorovaných a symbolické odkazy nejsou synchronizovány. Mezi to patří:</translation>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation>Přijmout</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
- <translation>Synchronizováno</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation>Zkusit znovu všechna nahrání</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br/&gt;Účet %1 nemá zapnuté aktivity.</translation>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -680,12 +608,12 @@
<translation>Nenastaven žádný NextCloud účet</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>Nastavený server je vůči tomuto klientovi příliš staré verze</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Aktualizujte server na nejnovější verzi a pak klienta restartujte.</translation>
</message>
@@ -901,35 +829,35 @@
<translation>Nezdařilo se přečtení systémového exclude souboru</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Nová složka větší než %1 MB byla přidána: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>Byla přidána složka z externího úložiště.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Pokud to chcete stáhnout, jděte do nastavení a vyberte to.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Složka %1 byla vytvořena ale byla dříve vynechána ze synchronizace. Nebude synchronizována.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Soubor %1 byl vytvořen ale byl dříve byl vynechán ze synchronizace. Nebude synchronizován.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -942,7 +870,7 @@ To znamená, že synchronizační klient nemusí místní změny okamžitě nahr
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -953,7 +881,7 @@ Pokud se rozhodnete soubory ponechat, budou znovu synchronizovány se serverem p
Pokud se soubory rozhodnete smazat, nebudou vám dostupné, pokud nejste vlastník.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
@@ -962,22 +890,22 @@ Tyto soubory budou smazány také na serveru a pokud je neobnovíte, nebudou dos
Pokud tato akce nebyla cílená, můžete svá data obnovit nyní.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation>Smazat všechny soubory?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation>Smazat všechny soubory</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation>Obnovit smazané soubory</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -986,17 +914,17 @@ Toto může být způsobeno obnovením zálohy na straně serveru.
Pokračováním v synchronizaci způsobí přepsání všech vašich souborů staršími soubory z dřívějšího stavu. Přejete si ponechat své místní nejaktuálnější soubory jako konfliktní soubory?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>Zjištěna záloha</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>Normální synchronizace</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>Ponechat místní soubory jako konflikt</translation>
</message>
@@ -1483,22 +1411,22 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation>Je vyžadováno heslo ke sdílení</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<source>Please enter a password for your link share:</source>
<translation>Zadejte heslo pro sdílení odkazem:</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation>Chyba sdílení</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2319,7 +2247,7 @@ Nedoporučuje se jí používat.</translation>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="993"/>
<source>Error writing metadata to the database</source>
- <translation>Chyba zápisu metadat do databáze</translation>
+ <translation>Chyba při zapisování metadat do databáze</translation>
</message>
</context>
<context>
@@ -2636,7 +2564,7 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>Zamítnout</translation>
</message>
@@ -2649,22 +2577,17 @@ Nedoporučuje se jí používat.</translation>
<translation>Nastavení</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>Aktivita</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>Obecné</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>Síť</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>Účet</translation>
</message>
@@ -2889,7 +2812,7 @@ Nedoporučuje se jí používat.</translation>
<message>
<location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="83"/>
<source>%1 - Authenticate</source>
- <translation>%1 – ověření</translation>
+ <translation>%1 – ověřit se</translation>
</message>
<message>
<location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/>
@@ -2910,60 +2833,54 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation>Sdílet s %1</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation>Sdílení kontextové nabídky</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation>Něco jsem vám nasdílel(a)</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation>Možnosti sdílení</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation>Sdílet prostřednictvím %1</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation>Poslat soukromý odkaz e-mailem…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation>Zkopírovat soukromý odkaz do schránky</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<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.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation>Zkopírovat veřejný odkaz</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation>Zkopírovat interní odkaz</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation>Otevřít v prohlížeči</translation>
</message>
@@ -3450,7 +3367,7 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3458,17 +3375,68 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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. Více informací 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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<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>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3505,234 +3473,113 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>Přihlaste se</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>Složka %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>Nejsou nastavené žádné složky pro synchronizaci.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>Otevřít v prohlížeči</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>Odhlásit se</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>Nedávné změny</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>Spravované složky:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>Otevřít složku „%1“</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>Otevřít %1 v prohlížeči</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>Neznámý stav</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>Nápověda</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>Ukončit %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation>Odpojeno od %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation>Nepodporovaná verze serveru</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>Server na účtu %1 používá starou a nepodporovanou verzi %2. Používání tohoto klienta s nepodporovanými verzemi serveru není testováno a může být nebezpečné. Pokračujte na vlastní riziko.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>Odpojeno</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation>Odpojeno od některých účtů</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>Odpojeno od účtů:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>Účet %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>Odhlášeno</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>Synchronizace účtu je vypnuta</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>Synchronizace je pozastavena</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation>Nevyřešené konflikty</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>Chyba při synchronizaci</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation>Nejsou nastavené žádné složky pro synchronizaci</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation>Znovu spustit všechny složky</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>Pozastavit všechny složky</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation>Přihlásit…</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation>Znovu spustit veškerou synchronizaci</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation>Znovu spustit synchronizaci</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>Pozastavit veškerou synchronizaci</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>Pozastavit synchronizaci</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Synchronizuje se %1 z %2 (zbývá %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation>Zhavarovat</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation>Aplikace</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation>Nastavení…</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation>Nový účet…</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation>Zobrazit další aktivitu…</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>Žádné nedávno synchronizované položky</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation>Zjišťují se změny ve vzdáleném „%1“</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation>Zjišťují se změny v místním „%1“</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation>Synchronizace %1 z %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>Synchronizuje se %1 (zbývá %2)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>Synchronizuje se %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>Aktuální</translation>
</message>
@@ -4004,7 +3851,7 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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 958dec44f..54f2477ba 100644
--- a/translations/client_da.ts
+++ b/translations/client_da.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>Lagerplads: ...</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>Annuller</translation>
</message>
@@ -242,230 +242,199 @@
<translation>Forbundet med &lt;server&gt; som &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>Ingen konto konfigureret.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>Tilføj ny</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>Fjern</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>Konto</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation>Denne konto supporterer end-to-end kryptering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation>Slå kryptering til</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation>vis E2E huskeregel</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation>Krypter</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>Vælg hvad der skal synkroniseres</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>Gennemtving synkronisering nu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>Genstart synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>Fjern mappesynkroniseringsforbindelse</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>Fejl ved oprettelse af mappe</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>Synkronisering i gang</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Synkronisering pågår.&lt;br/&gt;Ønsker du at afslutte den?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 i brug</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 som &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>Server version %1 er gammel og usupporteret! Fortsæt på egen risiko.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>Forbundet til %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Serveren %1 er midlertidig utilgængelig.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Serveren %1 er i vedligeholdelsestilstand.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>Logget ud fra %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>Ingen forbindelse til %1 hos %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>Log ind</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Der er mapper som ikke blev synkroniseret fordi de er for store:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Der er mapper som ikke blev synkroniseret fordi de er eksterne lagre:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Der er mapper som ikke blev synkroniseret fordi de er for store eller eksterne lagre:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Bekræft sletning af konto</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<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/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>Fjern forbindelse</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>Åbn mappe</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>Log ud</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>Genoptag synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>Paus synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Ønsker du virkelig at stoppe synkronisering af mappen &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/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) af %2 i brug. Nogle mapper, inklusiv netværksdiske eller delte mapper, har muligvis andre begrænsninger.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>%1 af %2 er i brug</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>Der er i øjeblikket ingen informationer om brug af lager tilgængelig.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>Ingen %1 forbindelse konfigureret.</translation>
</message>
@@ -473,103 +442,62 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>Logget ud</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>Frakoblet</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>Forbundet</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>Service utilgængelig</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>Vedligeholdelsestilstand</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>Netværksfejl</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>Konfigurationsfejl</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>Forespørger om brugeroplysninger</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>Ukendt konto tilstand</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation>Mere information</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation>Accepter</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation>Deltag</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation>Åbn browser</translation>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation>Accepter</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
- <translation>S</translation>
- </message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation>Prøv fejlede alle fejlede uploads igen</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br/&gt;Konto %1 har ikke nogen aktiviteter slået til.</translation>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -680,12 +608,12 @@
<translation>Ingen ownCloud konto konfigureret</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation type="unfinished"/>
</message>
@@ -901,34 +829,34 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -937,7 +865,7 @@ This means that the synchronization client might not upload local changes immedi
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -945,46 +873,46 @@ If you decide to delete the files, they will be unavailable to you, unless you a
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>Normal synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@@ -1471,22 +1399,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2616,7 +2544,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
@@ -2629,22 +2557,17 @@ It is not advisable to use it.</source>
<translation>Indstillinger</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>Aktivitet</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>Netværk</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>Konto</translation>
</message>
@@ -2890,60 +2813,54 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation type="unfinished"/>
</message>
@@ -3428,7 +3345,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3436,281 +3353,211 @@ It is not advisable to use it.</source>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>OCC::WebEnginePage</name>
+ <name>OCC::User</name>
<message>
- <location filename="../src/gui/wizard/webview.cpp" line="208"/>
- <source>Invalid certificate detected</source>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/webview.cpp" line="209"/>
- <source>The host &quot;%1&quot; provided an invalid certificate. Continue?</source>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::WebFlowCredentials</name>
<message>
- <location filename="../src/gui/creds/webflowcredentials.cpp" line="169"/>
- <source>You have been logged out of %1 as user %2. Please login again</source>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/webflowcredentials.cpp" line="189"/>
- <source>Please login with the user: %1</source>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::WebFlowCredentialsDialog</name>
<message>
- <location filename="../src/gui/creds/webflowcredentialsdialog.cpp" line="34"/>
- <source>Log in</source>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>OCC::ownCloudGui</name>
+ <name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
- <source>Please sign in</source>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
- <source>Folder %1: %2</source>
- <translation>Mappe %1: %2</translation>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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/owncloudgui.cpp" line="357"/>
- <source>There are no sync folders configured.</source>
+ <location filename="../src/gui/tray/UserModel.cpp" line="688"/>
+ <source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>Åbn i browser</translation>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
</message>
+</context>
+<context>
+ <name>OCC::WebEnginePage</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>Log ud</translation>
+ <location filename="../src/gui/wizard/webview.cpp" line="208"/>
+ <source>Invalid certificate detected</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
+ <location filename="../src/gui/wizard/webview.cpp" line="209"/>
+ <source>The host &quot;%1&quot; provided an invalid certificate. Continue?</source>
<translation type="unfinished"/>
</message>
+</context>
+<context>
+ <name>OCC::WebFlowCredentials</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
+ <location filename="../src/gui/creds/webflowcredentials.cpp" line="169"/>
+ <source>You have been logged out of %1 as user %2. Please login again</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
+ <location filename="../src/gui/creds/webflowcredentials.cpp" line="189"/>
+ <source>Please login with the user: %1</source>
<translation type="unfinished"/>
</message>
+</context>
+<context>
+ <name>OCC::WebFlowCredentialsDialog</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
+ <location filename="../src/gui/creds/webflowcredentialsdialog.cpp" line="34"/>
+ <source>Log in</source>
<translation type="unfinished"/>
</message>
+</context>
+<context>
+ <name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
+ <source>Please sign in</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>Hjælp</translation>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
+ <source>Folder %1: %2</source>
+ <translation>Mappe %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
+ <source>There are no sync folders configured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>Konto %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>Synkroniserer %1 (%2 tilbage)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>Synkroniserer %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation type="unfinished"/>
</message>
@@ -3982,7 +3829,7 @@ It is not advisable to use it.</source>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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_de.ts b/translations/client_de.ts
index 471540167..98cfa21ba 100644
--- a/translations/client_de.ts
+++ b/translations/client_de.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>Speicherplatz: ...</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>Abbrechen</translation>
</message>
@@ -242,230 +242,199 @@
<translation>Verbunden mit &lt;server&gt; als &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>Kein Konto konfiguriert.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>Neues Konto hinzufügen</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>Entfernen</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>Benutzerkonto</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation>Dieses Konto unterstützt Ende-zu-Ende-Verschlüsselung</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation>Verschlüsselung aktivieren</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation>Gedächtnisstütze für E2E anzeigen</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation>Verschlüsseln</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation>Ignorierte Dateien bearbeiten</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>Zu synchronisierende Elemente auswählen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>Synchronisierung jetzt erzwingen </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>Synchronisierung neustarten</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>Ordner-Synchronisierung entfernen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>Anlegen des Ordners fehlgeschlagen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Bestätigen Sie die Löschung der Ordner-Synchronisierung</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>Ordner-Synchronisierung entfernen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>Synchronisierung läuft</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Die Synchronisierung läuft gerade.&lt;br/&gt;Wollen Sie sie beenden?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 wird verwendet</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 als &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>Die Serverversion %1 ist veraltet und wird nicht mehr unterstützt! Fortfahren auf eigenes Risiko.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>Verbunden mit %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Server %1 ist derzeit nicht verfügbar.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Server %1 befindet sich im Wartungsmodus.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>Abgemeldet von %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Berechtigung vom Browser einholen. &lt;a href=&apos;%1&apos;&gt; KlickenSie hier &lt;/a&gt;, um den Browser erneut zu öffnen.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>Keine Verbindung zu %1 auf %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>Einloggen</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Einige Verzeichnisse konnten nicht synchronisiert werden, da sie zu groß sind:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Es gibt Verzeichnisse, die nicht synchronisiert werden konnten, da sie externe Speicher sind:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Es gibt Verzeichnisse, die nicht synchronisiert werden konnten, da sie zu groß oder externe Speicher sind:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Konto wirklich entfernen?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Wollen Sie wirklich die Verbindung zum Konto &lt;i&gt;%1&lt;/i&gt; lösen?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anmerkung:&lt;/b&gt; Dieser Vorgang wird &lt;b&gt;keine&lt;/b&gt; Dateien löschen.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>Verbindung entfernen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>Ordner öffnen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>Abmelden</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>Synchronisierung fortsetzen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>Synchronisierung pausieren</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;Konnte lokalen Ordner &lt;i&gt;%1&lt;/i&gt; nicht anle‏gen.‎&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Möchten Sie den Ordner &lt;i&gt;%1&lt;/i&gt; wirklich nicht mehr synchronisieren?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anmerkung:&lt;/b&gt; Dies wird &lt;b&gt;keine&lt;/b&gt; Dateien löschen.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) von %2 Serverkapazität verwendet. Einige Ordner, einschließlich über das Netzwerk verbundene oder geteilte Ordner, können unterschiedliche Beschränkungen aufweisen. </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>%1 von %2 Serverkapazität verwendet</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>Derzeit sind keine Speichernutzungsinformationen verfügbar.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation>Verbinde zu %1 …</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>Keine %1-Verbindung konfiguriert.</translation>
</message>
@@ -473,103 +442,62 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>Abgemeldet</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>Getrennt</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>Verbunden</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>Dienst nicht verfügbar</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>Wartungsmodus</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>Netzwerkfehler</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>Konfigurationsfehler</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>Zugangsdaten werden abgefragt</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>Unbekannter Konto-Zustand</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation>Weitere Informationen</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation>Akzeptieren</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation>Beitreten</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation>Browser öffnen</translation>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation>Dateien aus der Ignorierliste sowie symbolische Links werden nicht synchronisiert. Dazu gehören:</translation>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation>Akzeptieren</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
- <translation>Synchronisiert</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation>Alle Uploads neu starten</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br/&gt;Für Konto %1 sind serverseitig keine Aktivitäten aktiviert.</translation>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -680,12 +608,12 @@
<translation>Kein Nextcloud-Konto konfiguriert</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>Der konfigurierte Server ist für diesen Client zu alt</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Aktualisieren Sie auf die neueste Server-Version und starten Sie den Client neu.</translation>
</message>
@@ -901,36 +829,36 @@
<translation>Systemeigene Ausschlussdatei kann nicht gelesen werden</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Ein neues Verzeichnis größer als %1 MB wurde hinzugefügt: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>Ein Verzeichnis von einem externen Speicher wurde hinzugefügt.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Bitte wechseln Sie zu den Einstellungen, falls Sie das Verzeichnis herunterladen möchten.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Der Ordner %1 wurde erstellt, wurde jedoch zuvor von der Synchronisierung ausgeschlossen. Die darin enthaltenen Daten werden nicht synchronisiert.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Die Datei % 1 wurde erstellt, jedoch bereits zuvor von der Synchronisierung ausgeschlossen. Sie wird nicht synchronisiert werden.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -943,7 +871,7 @@ Dies bedeutet, dass der Synchronisierungs-Client lokale Änderungen möglicherwe
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -954,7 +882,7 @@ Wenn Sie sich dazu entscheiden, diese Dateien zu behalten, werden diese wieder z
Wenn Sie sich zum Löschen der Dateien entscheiden, sind diese nicht mehr verfügbar, außer Sie sind der Eigentümer.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
@@ -963,22 +891,22 @@ Diese Dateien werden auch vom Server gelöscht werden und sind dann auch auf Ihr
Wenn die Aktion unbeabsichtigt war, können Sie die gelöschten Danten nun wiederherstellen.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation>Alle Dateien löschen?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation>Alle Dateien löschen</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation>Gelöschte Dateien wiederherstellen</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -987,17 +915,17 @@ Der Grund dafür ist möglicherweise, dass auf dem Server ein Backup eingespielt
Wenn diese Synchronisierung fortgesetzt wird, werden Dateien eventuell von älteren Versionen überschrieben. Möchten Sie die neueren lokalen Dateien als Konflikt-Dateien behalten?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>Backup erkannt</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>Normale Synchronisierung</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>Lokale Konfliktdateien behalten</translation>
</message>
@@ -1484,22 +1412,22 @@ Wenn diese Synchronisierung fortgesetzt wird, werden Dateien eventuell von älte
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation>Passwort für die Freigabe erforderlich</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<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/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation>Fehler beim Teilen</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2636,7 +2564,7 @@ Es ist nicht ratsam, sie zu benutzen.</translation>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>Ausblenden</translation>
</message>
@@ -2649,22 +2577,17 @@ Es ist nicht ratsam, sie zu benutzen.</translation>
<translation>Einstellungen</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>Aktivität</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>Allgemein</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>Netzwerk</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>Benutzerkonto</translation>
</message>
@@ -2910,60 +2833,54 @@ Es ist nicht ratsam, sie zu benutzen.</translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation>Teile mit %1</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation>Kontextmenü Freigabe</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation>Ich habe etwas mit Ihnen geteilt</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation>Freigabeoptionen</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation>Teilen mittels %1</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation>Privaten Link als E-Mail verschicken ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation>Privater Link in die Zwischenablage kopiert</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation>Weiterteilen dieser Datei ist nicht erlaubt</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation>Öffentlichen Link kopieren</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation>Kopiere internen Link</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation>Im Browser öffnen</translation>
</message>
@@ -3450,7 +3367,7 @@ Es ist nicht ratsam, sie zu benutzen.</translation>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3458,17 +3375,68 @@ Es ist nicht ratsam, sie zu benutzen.</translation>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<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>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3505,234 +3473,113 @@ Es ist nicht ratsam, sie zu benutzen.</translation>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>Bitte melden Sie sich an</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>Ordner %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>Es wurden keine Synchronisierungsordner konfiguriert.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>Im Browser öffnen</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>Abmelden</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>Letzte Änderungen</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>Verwaltete Ordner:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>Ordner &apos;%1&apos; öffnen</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>%1 im Browser öffnen</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>Unbekannter Status</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>Hilfe</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>%1 beenden</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation>Von %1 trennen</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation>Nicht unterstütze Server-Version</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>Der Server mit Konto %1 läuft mit der alten und nicht unterstützten Version %2. Die Verwendung dieses Clients mit der nicht unterstützten Serverversion ist ungetestet und möglicherweise gefährlich. Fortfahren auf eigenes Risiko.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>Getrennt</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation>Verbindungen zu einigen Konnten getrennt</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>Verbindungen zu Konnten getrennt:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>Konto %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>Abgemeldet</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>Account-Synchronisierung ist deaktiviert</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>Synchronisierung ist pausiert</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation>Ungelöste Konflikte</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>Fehler bei der Synchronisierung</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation>Keine Ordner zur Synchronisierung konfiguriert</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation>Alle Ordner fortsetzen</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>Alle Ordner pausieren</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation>Anmelden</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation>Alle Synchronisierungen fortsetzen</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation>Synchronisierung fortsetzen</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>Gesamte Synchronisierung pausieren</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>Synchronisierung pausieren</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Synchronisiere %1 von %2 (%3 übrig)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation>Jetzt abstürzen lassen</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation>Apps</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation>Einstellungen …</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation>Neues Konto …</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation>Weitere Aktivitäten anzeigen…</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>Keine kürzlich synchronisierten Elemente</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation>Suche nach Änderungen in &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation>Checking for changes in local &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation>Synchronisiere %1 von %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>Synchronisiere %1 (%2 übrig)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>Synchronisiere %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>Aktuell</translation>
</message>
@@ -4004,7 +3851,7 @@ Es ist nicht ratsam, sie zu benutzen.</translation>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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 9f32367bb..95cf69898 100644
--- a/translations/client_el.ts
+++ b/translations/client_el.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>Χώρος αποθήκευσης: ...</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>Άκυρο</translation>
</message>
@@ -242,230 +242,199 @@
<translation>Συνδεδεμένοι με το &lt;server&gt; ως &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>Δεν ρυθμίστηκε λογαριασμός.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>Προσθήκη νέου</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>Αφαίρεση</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>Λογαριασμός</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation>Ο λογαριασμός υποστηρίζει κρυπτογράφηση από άκρη σε άκρη</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation>Ενεργοποίηση κρυπτογράφησης</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation>Εμφάνιση μνήμης Ε2Ε</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation>Κρυπτογράφηση</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation>Έλεγχος εξαιρούμενων</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>Επιλέξτε τι θα συγχρονιστεί</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>Συγχρονισμός τώρα</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>Επανεκκίνηση συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>Αφαίρεση συγχρονισμού φακέλου</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>Αποτυχία δημιουρργίας φακέλου</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Επιβεβαίωση αφαίρεσης συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>Αφαίρεση συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>Εκτελείται Συγχρονισμός </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Η λειτουργία συγχρονισμού εκτελείται.&lt;br/&gt; Θέλετε να την τερματίσετε;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 σε χρήση</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 ως &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>Η έκδοση του διακομιστή %1 είναι παλιά και δεν υποστηρίζεται! Προχωρείστε με δική σας ευθύνη.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>Συνδεδεμένο με %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Ο διακομιστής %1 δεν είναι διαθέσιμος προσωρινά.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Ο διακομιστής %1 βρίσκεται τώρα σε κατάσταση συντήρησης.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>Αποσυνδέθηκε από %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Γίνεται λήψη της εξουσιοδότησης από το πρόγραμμα περιήγησης. Κάντε κλικ &lt;a href=&apos;%1&apos;&gt;εδώ&lt;/a&gt; για να ανοίξετε πάλι το πρόγραμμα περιήγησης.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>Δεν υπάρχει σύνδεση με το %1 στο %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>Είσοδος</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Υπάρχουν φάκελοι που δεν συγχρονίστηκαν επειδή είναι πολύ μεγάλοι:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Υπάρχουν φάκελοι που δεν συγχρονίστηκαν επειδή είναι εξωτερικοί αποθηκευτικοί χώροι:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Υπάρχουν φάκελοι που δεν συγχρονίστηκαν επειδή είναι πολύ μεγάλοι ή αποθηκευτικοί χώροι:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Επιβεβαίωση Αφαίρεσης Λογαριασμού</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Θέλετε πραγματικά να αφαιρέσετε τη σύνδεση με το λογαριασμό &lt;i&gt;%1&lt;/i&gt;;&lt;/p&gt;&lt;p&gt;&lt;b&gt;Σημείωση:&lt;/b&gt; Αυτό &lt;b&gt;δεν&lt;/b&gt; θα διαγράψει κανένα αρχείο.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>Αφαίρεση σύνδεσης</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>Άνοιγμα φακέλου</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>Αποσύνδεση</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>Συνέχιση συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>Παύση συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;Αδυναμία δημιουργίας τοπικού φακέλου &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Θέλετε πραγματικά να σταματήσετε το συγχρονισμό του φακέλου &lt;i&gt;%1&lt;/i&gt;;&lt;/p&gt;&lt;p&gt;&lt;b&gt;Σημείωση:&lt;/b&gt; Αυτό &lt;b&gt;δεν&lt;/b&gt; θα διαγράψει κανένα αρχείο.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) από %2 σε χρήση. Μερικοί φάκελοι, συμπεριλαμβανομένων των δικτυακών ή των κοινόχρηστων μπορεί να έχουν διαφορετικά όρια.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>%1 από %2 σε χρήση</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>Προς το παρόν δεν υπάρχουν πληροφορίες χρήσης χώρου αποθήκευσης διαθέσιμες.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation>Σύνδεση σε %1 &apos;...&apos;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>Δεν έχει ρυθμιστεί σύνδεση με το %1.</translation>
</message>
@@ -473,103 +442,62 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>Αποσύνδεση</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>Αποσυνδεδεμένο</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>Συνδεδεμένο</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>Η υπηρεσία δεν είναι διαθέσιμη</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>Κατάσταση συντήρησης</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>Σφάλμα δικτύου</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>Σφάλμα ρυθμίσεων</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>Ερώτηση πιστοποιητικών</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>Άγνωστη κατάσταση λογαριασμού</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation>Περισσότερες πληροφορίες</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation>Αποδοχή</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation>Συμμετοχή</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation>Άνοιγμα Περιηγητή</translation>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation>Τα αρχεία από την λίστα αγνόησης αλλά και των συμβολικών συνδέσμων δεν θα συνχρονιστούν. Περιλαμβάνει: </translation>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation>Αποδοχή</translation>
- </message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
- <translation>Συγχρονίστηκε</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation>Επανάληψη όλων των μεταφορτώσεων</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br/&gt;Ο λογαριασμός %1 δεν έχει ενεργοποιήσει τις δραστηριότητες.</translation>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -680,12 +608,12 @@
<translation>Δεν έχει ρυθμιστεί λογαριασμός ownCloud</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>Ο ρυθμισμένος διακομιστής για αυτό το δέκτη είναι πολύ παλιός</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Παρακαλώ ενημερώστε το διακομιστή στη νεώτερη έκδοση και επανεκκινήστε το δέκτη.</translation>
</message>
@@ -901,36 +829,36 @@
<translation>Αδυναμία ανάγνωσης αρχείου αποκλεισμού συστήματος</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Προστέθηκε ένας νέος φάκελος μεγαλύτερος από %1 MB: %2
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>Προστέθηκε ένας φάκελος από εξωτερικό αποθηκευτικό χώρο.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Μεταβείτε στις ρυθμίσεις για να το επιλέξετε εάν επιθυμείτε να το κατεβάσετε.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Ο φάκελος %1 που δημιουργήθηκε έχει εξαιρεθεί απο τον συγχρονισμό. Τα δεδομένα του δεν θα συγχρονιστούν.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Το αρχείο %1 που δημιουργήθηκε έχει εξαιρεθεί απο τον συγχρονισμό. Δεν θα συγχρονιστή.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -941,7 +869,7 @@ This means that the synchronization client might not upload local changes immedi
Αυτό σημαίνει ότι η εφαρμογή δεν θα ανεβάσει τις τοπικές αλλαγές άμεσα, θα ελέγξει μόνο τις τοπικές αλλαγές και θα τις ανεβάσει περιοδικά (κάθε δύο ώρες από προεπιλογή).</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -952,7 +880,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a
Εφόσον επιλέξετε να διαγράψετε τα αρχεία, δε θα είναι διαθέσιμα σε εσάς, εκτός εάν είστε ο κάτοχος.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
@@ -961,22 +889,22 @@ If this action was unintended you can restore the lost data now.</source>
Εάν αυτή η ενέργεια έγινε ακούσια επαναφέρετε τα δδεδομένα τώρα.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation>Διαγραφή όλων των αρχείων?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation>Διαγραφή όλων των αρχείων</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation>Επαναφορά διαγραμμένων αρχείων</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -985,17 +913,17 @@ Continuing the sync as normal will cause all your files to be overwritten by an
Η συνέχιση του συγχρονισμού κανονικά θα προκαλέσει την αντικατάσταση όλων των αρχείων σας από παλιότερο αρχείο σε προηγούμενη κατάσταση. Θέλετε να διατηρήσετε τα τοπικά σας πιο πρόσφατα αρχεία ως αρχεία σύγκρουσης;</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>Ανιχνεύθηκε αντίγραφο ασφαλείας</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>Κανονικός συγχρονισμός</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>Διατήρηση τοπικών αρχείων ως Διένεξη</translation>
</message>
@@ -1482,22 +1410,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation>Σφάλμα διαμοιρασμού</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2631,7 +2559,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>Αποδέσμευση</translation>
</message>
@@ -2644,22 +2572,17 @@ It is not advisable to use it.</source>
<translation>Ρυθμίσεις</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>Δραστηριότητα</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>Γενικά</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>Δίκτυο</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>Λογαριασμός</translation>
</message>
@@ -2905,60 +2828,54 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation>Διαμοιρασμός με %1</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation>Μοιράστηκα κάτι μαζί σου</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation>Επιλογές κοινής χρήσης</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation>Διαμοιρασμός μέσω %1</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation>Αποστολή ιδιωτικού συνδέσμου με αλληλογραφία...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation>Αντιγραφή ιδιωτικού συνδέσμου στο πρόχειρο</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation>Δεν επιτρέπεται ο επαναδιαμοιρασμός</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation>Αντιγραφή δημόσιου συνδέσμου</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation>Αντιγραφή εσωτερικού συνδέσμου</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation>Άνοιγμα στον περιηγητή</translation>
</message>
@@ -3445,7 +3362,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3453,17 +3370,68 @@ It is not advisable to use it.</source>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>&lt;p&gt;Η έκδοση παρέχεται από %1&lt;/p&gt;</translation>
</message>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3500,234 +3468,113 @@ It is not advisable to use it.</source>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>Παρκαλώ συνδεθείτε</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>Φάκελος %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>Δεν έχουν ρυθμιστεί φάκελοι συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>Άνοιγμα στον περιηγητή ιστού</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>Αποσύνδεση</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>Πρόσφατες Αλλαγές</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>Φάκελοι υπό Διαχείριση:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>Άνοιγμα φακέλου &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>Άνοιγμα %1 στον περιηγητή</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>Άγνωστη κατάσταση</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>Βοήθεια</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>Κλείσιμο %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation>Αποσυνδέθηκε από %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation>Μη υποστηριζόμενη έκδοση διακομιστή</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>Ο διακομιστής στο λογαριασμό% 1 εκτελεί μια παλιά και μη υποστηριζόμενη έκδοση% 2. Η χρήση αυτού του προγράμματος-πελάτη με μη υποστηριζόμενες εκδόσεις διακομιστών δεν είναι δοκιμασμένη και ενδεχομένως επικίνδυνη. Προχωρήστε με δική σας ευθύνη.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>Αποσυνδεδεμένο</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation>Έγινε αποσύνδεση από μερικούς λογαριασμούς</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>Αποσυνδέθηκε από τους λογαριασμούς:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>Λογαριασμός %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>Αποσύνδεση</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>Ο λογαριασμός συγχρονισμού έχει απενεργοποιηθεί</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>Παύθηκε ο συγχρονισμός</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation>Άλυτες διενέξεις</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>Σφάλμα κατά τον συγχρονισμό</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation>Δεν ρυθμίστηκαν φάκελοι συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation>Συνέχιση όλων των φακέλων</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>Παύση όλων των φακέλων</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation>Είσοδος &apos;...&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation>Συνέχιση όλων των συγχρονισμών</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation>Συνέχιση συγχρονισμού</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>Παύση όλων των συγχρονισμών</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>Παύση συγχρονισμού</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Συγχρονισμός %1 από %2 (%3 απομένουν)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation>Κατάρρευση τώρα</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation>Εφαρμογές</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation>Ρυθμίσεις &apos;...&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation>Νέος λογαριασμός &apos;...&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation>Εμφάνιση περισσότερης δραστηριότητας &apos;...&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>Κανένα στοιχείο δεν συγχρονίστηκε πρόσφατα</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation>Έλεγχος για αλλαγές σε απομακρυσμένο &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation>Έλεγχος για αλλαγές τοπικά &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation>Συγχρονισμός %1 από %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>Συγχρονισμός %1 (%2 απομένουν)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>Συγχρονισμός %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>Ενημερωμένο</translation>
</message>
@@ -3999,7 +3846,7 @@ It is not advisable to use it.</source>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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_en.ts b/translations/client_en.ts
index f40d17b0c..80c52edb5 100644
--- a/translations/client_en.ts
+++ b/translations/client_en.ts
@@ -202,7 +202,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation type="unfinished"></translation>
</message>
@@ -233,8 +233,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
@@ -244,230 +244,199 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation type="unfinished"></translation>
</message>
@@ -475,102 +444,61 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -682,12 +610,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation type="unfinished"></translation>
</message>
@@ -927,34 +855,34 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -963,7 +891,7 @@ This means that the synchronization client might not upload local changes immedi
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder &apos;%1&apos; were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -971,46 +899,46 @@ If you decide to delete the files, they will be unavailable to you, unless you a
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder &apos;%1&apos;.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder &apos;%1&apos;.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"></translation>
</message>
@@ -1500,22 +1428,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2645,7 +2573,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation type="unfinished"></translation>
</message>
@@ -2658,22 +2586,17 @@ It is not advisable to use it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation type="unfinished"></translation>
</message>
@@ -2919,60 +2842,54 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation type="unfinished"></translation>
</message>
@@ -3457,7 +3374,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation type="unfinished"></translation>
</message>
@@ -3465,281 +3382,211 @@ It is not advisable to use it.</source>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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"></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
- <name>OCC::WebEnginePage</name>
+ <name>OCC::User</name>
<message>
- <location filename="../src/gui/wizard/webview.cpp" line="208"/>
- <source>Invalid certificate detected</source>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/webview.cpp" line="209"/>
- <source>The host &quot;%1&quot; provided an invalid certificate. Continue?</source>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>OCC::WebFlowCredentials</name>
<message>
- <location filename="../src/gui/creds/webflowcredentials.cpp" line="169"/>
- <source>You have been logged out of %1 as user %2. Please login again</source>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/creds/webflowcredentials.cpp" line="189"/>
- <source>Please login with the user: %1</source>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>OCC::WebFlowCredentialsDialog</name>
<message>
- <location filename="../src/gui/creds/webflowcredentialsdialog.cpp" line="34"/>
- <source>Log in</source>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
- <name>OCC::ownCloudGui</name>
+ <name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
- <source>Please sign in</source>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
- <source>Folder %1: %2</source>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
- <source>There are no sync folders configured.</source>
+ <location filename="../src/gui/tray/UserModel.cpp" line="688"/>
+ <source>Remove connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
<translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>OCC::WebEnginePage</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
+ <location filename="../src/gui/wizard/webview.cpp" line="208"/>
+ <source>Invalid certificate detected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
+ <location filename="../src/gui/wizard/webview.cpp" line="209"/>
+ <source>The host &quot;%1&quot; provided an invalid certificate. Continue?</source>
<translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>OCC::WebFlowCredentials</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
+ <location filename="../src/gui/creds/webflowcredentials.cpp" line="169"/>
+ <source>You have been logged out of %1 as user %2. Please login again</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
+ <location filename="../src/gui/creds/webflowcredentials.cpp" line="189"/>
+ <source>Please login with the user: %1</source>
<translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>OCC::WebFlowCredentialsDialog</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
+ <location filename="../src/gui/creds/webflowcredentialsdialog.cpp" line="34"/>
+ <source>Log in</source>
<translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
+ <source>Please sign in</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
+ <source>Folder %1: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
+ <source>There are no sync folders configured.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation type="unfinished"></translation>
</message>
@@ -4047,7 +3894,7 @@ It is not advisable to use it.</source>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/client_en_GB.ts b/translations/client_en_GB.ts
index 1fffc75bf..5679b23ce 100644
--- a/translations/client_en_GB.ts
+++ b/translations/client_en_GB.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>Storage space: ...</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>Cancel</translation>
</message>
@@ -242,230 +242,199 @@
<translation>Connected with &lt;server&gt; as &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>No account configured.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>Add new</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>Remove</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>Account</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation>Show E2E mnemonic</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation>Encrypt</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>Choose what to sync</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>Force sync now</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>Restart sync</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>Remove folder sync connection</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>Folder creation failed</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Confirm Folder Sync Connection Removal</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>Remove Folder Sync Connection</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>Sync Running</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 in use</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 as &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>The server version %1 is old and unsupported! Proceed at your own risk.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>Connected to %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Server %1 is temporarily unavailable.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Server %1 is currently in maintenance mode.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>Signed out from %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Obtaining authorisation from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>No connection to %1 at %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>Log in</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>There are folders that were not synchronised because they are too big: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>There are folders that were not synchronised because they are external storages: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>There are folders that were not synchronised because they are too big or external storages: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Confirm Account Removal</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<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;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;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>Remove connection</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>Open folder</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>Log out</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>Resume sync</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>Pause sync</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>%1 of %2 in use</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>Currently there is no storage usage information available.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>No %1 connection configured.</translation>
</message>
@@ -473,104 +442,63 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>Signed out</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>Disconnected</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>Connected</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>Service unavailable</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>Maintenance mode</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>Network error</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>Configuration error</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>Asking Credentials</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>Unknown account state</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation>More information</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation>Accept</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation>Join</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation>Open Browser</translation>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation>Accept</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation>Retry all uploads</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br/&gt;Account %1 does not have activities enabled.</translation>
- </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
@@ -680,12 +608,12 @@
<translation>No ownCloud account configured</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>The configured server for this client is too old</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Please update to the latest server and restart the client.</translation>
</message>
@@ -901,36 +829,36 @@
<translation>Could not read system exclude file</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>A new folder larger than %1 MB has been added: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>A folder from an external storage has been added.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Please go in the settings to select it if you wish to download it.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -943,7 +871,7 @@ This means that the synchronization client might not upload local changes immedi
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -951,29 +879,29 @@ If you decide to delete the files, they will be unavailable to you, unless you a
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -982,17 +910,17 @@ This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>Backup detected</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>Normal Synchronisation</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>Keep Local Files as Conflict</translation>
</message>
@@ -1479,22 +1407,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation>Sharing error</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2630,7 +2558,7 @@ It is not advisable to use it.</translation>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>Dismiss</translation>
</message>
@@ -2643,22 +2571,17 @@ It is not advisable to use it.</translation>
<translation>Settings</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>Activity</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>General</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>Network</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>Account</translation>
</message>
@@ -2904,60 +2827,54 @@ It is not advisable to use it.</translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation>Share with %1</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation>Context menu share</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation>I shared something with you</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation>Copy private link to clipboard</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation>Resharing this file is not allowed</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation>Open in browser</translation>
</message>
@@ -3444,7 +3361,7 @@ It is not advisable to use it.</translation>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3452,17 +3369,68 @@ It is not advisable to use it.</translation>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<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>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3499,234 +3467,113 @@ It is not advisable to use it.</translation>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>Please sign in</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>Folder %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>There are no sync folders configured.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>Open in browser</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>Log out</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>Recent Changes</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>Managed Folders:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>Open folder &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>Open %1 in browser</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>Unknown status</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>Help</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>Quit %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation>Disconnected from %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation>Unsupported Server Version</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>Disconnected</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation>Disconnected from some accounts</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>Disconnected from accounts:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>Account %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>Signed out</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>Account synchronisation is disabled</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>Synchronisation is paused</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation>Unresolved conflicts</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>Error during synchronisation</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation>No sync folders configured</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation>Resume all folders</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>Pause all folders</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation>Resume all synchronization</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation>Resume synchronization</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>Pause all synchronisation</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>Pause synchronisation</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation>Crash now</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation>Apps</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>No items synced recently</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation>Checking for changes in remote &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation>Checking for changes in local &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation>Syncing %1 of %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>Syncing %1 (%2 left)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>Syncing %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>Up to date</translation>
</message>
@@ -3998,7 +3845,7 @@ It is not advisable to use it.</translation>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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 a4e46571a..4a298eb6a 100644
--- a/translations/client_eo.ts
+++ b/translations/client_eo.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>Konserveja spaco: ...</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>Nuligi</translation>
</message>
@@ -242,230 +242,199 @@
<translation>Konektita kun servilo &lt;server&gt; kiel uzanto &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>Neniu konto agordita.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>Aldoni novan</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>Forigi</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>Konto</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation>Tiu konto subtenas tutvojan ĉifradon</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation>Ebligi ĉifradon</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation>Montri E2E memorigilon</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation>Ĉifri</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation>Redakti ignoritajn dosierojn</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>Elekti tion, kion sinkronigi</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>Sinkronigi nun</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>Rekomenci sinkronigon</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>Ne plu sinkronigi tiun dosierujon</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>Kreo de dosierujo malsukcesis</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Konfirmu la forigadon de la sinkronigo de tiu dosierujo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>Ne plu sinkronigi tiun dosierujon</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>Sinkronigo ruliĝanta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Sinkronigo estas ruliĝanta.&lt;br/&gt;Ĉu vi volas fini ĝin?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 uzata(j)</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 per la konto &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>La servilo je versio %1 estas malnova kaj nesubtenata. Daŭrigu je via risko.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>Konektita al %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Servilo %1 dumtempe ne disponeblas</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>La servilo %1 estas en reĝimo de prizorgado</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>Elsalutita de %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Atendante rajtigon el la retumilo. &lt;a href=&apos;%1&apos;&gt;Alklaku ĉi tie&lt;/a&gt; por remalfermi la retumilon.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>Neniu konekto al servilo %1 je la adreso %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>Ensaluti</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Kelkaj dosierujoj ne sinkroniĝis, ĉar ili estas tro grandaj:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Kelkaj dosierujoj ne sinkroniĝis, ĉar ili estas konservataj en ekstera konservejo:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Kelkaj dosierujoj ne sinkroniĝis, ĉar ili estas tro grandaj âù konservataj en ekstera konservejo:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Konfirmi forigadon de la konto</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<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;Ĉu vi vere volas forigi konekton al la konto &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Notu:&lt;/b&gt; Tio &lt;b&gt;ne&lt;/b&gt; forigos la dosierojn.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>Forigi konekton</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>Malfermi dosierujon</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>Elsaluti</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>Daŭrigi sinkronigon</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>Paŭzigi sinkronigon</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Ĉu vi vere volas ĉesi sinkronigi la dosierujon &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Notu:&lt;/b&gt; Tio &lt;b&gt;ne&lt;/b&gt; forigos la dosierojn.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) el %2 uzataj. Certaj dosierujoj, inkluzive de rete muntitaj aŭ kunhavigitaj dosierujoj, eble havas aliajn limigojn.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>%1 el %2 uzitaj</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>Ĉi-momente estas neniu informo pri konservejospaco.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>Neniu konekto al %1 agordita.</translation>
</message>
@@ -473,103 +442,62 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>Elsalutita</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>Malkonektita</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>Konektita</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>Servo nedisponebla</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>Reĝimo de prizorgado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>Reta eraro</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>Agorda eraro</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>Akreditiloj petitaj</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>Konto-stato nekonita</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation>Pli da informoj</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation>Akcepti</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation>Aliĝi</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation>Malfermi retumilon</translation>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation>Dosieroj el la listo de ignoritaj dosieroj kaj ankaŭ simbolaj ligiloj ne sinkroniĝas. Tio entenas:</translation>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation>Akcepti</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
- <translation>Sinkronigita</translation>
- </message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation>Reprovi ĉiujn alŝutoj</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br/&gt;Konto %1 ne havas ebligitajn aktivaĵojn.</translation>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -680,12 +608,12 @@
<translation>Neniu own-Cloud-konto agordita.</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>La servilo agordita por tiu ĉi kliento estas tro malnova</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Bv. ĝisdatigi la servilon, kaj remalfermi la klienton.</translation>
</message>
@@ -901,36 +829,36 @@
<translation>Ne eblis legi la sisteman dosieron pri esceptoj</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Nova dosierujo pli granda ol %1 MB estis aldonita: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>Dosierujo el ekstera konservejo estis aldonita.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Bv. iri al la agordoj por elekti, ĉu vi volas elŝuti ĝin.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>La dosierujo %1 estis kreita sed estis eksigita el sinkronigo antaŭe. Datumoj ene de ĝi ne estos sinkronigitaj.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>La dosiero %1 estis kreita sed estis eksigita el sinkronigo antaŭe. Ĝi ne estos sinkronigita.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -943,7 +871,7 @@ Tio signifas, ke la sinkroniga kliento eble ne alŝutas tuj lokajn ŝanĝojn kaj
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -954,7 +882,7 @@ Se vi decidas restaŭri la dosierojn, ili estos resinkronigitaj al la servilo, s
Se vi decidas forigi la dosierojn, ili ne plu estos haveblaj al vi, krom se vi estas la posedanto.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
@@ -963,22 +891,22 @@ Tiuj dosieroj estos forigitaj el la servilo kaj ne plu disponeblos en viaj aliaj
Se tiu ago ne estis dezirata, vi povas restaŭri la perditajn datumojn nun.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation>Forigi ĉiujn dosierojn?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation>Forigi ĉiujn dosierojn</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation>Restaŭri forigitajn dosierojn</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -987,17 +915,17 @@ Tio estas eble kaŭzita de restaŭro de savkopio ĉe la servilo.
Se vi plu sinkronigas, la sinkronigo anstataŭigos ĉiujn viajn dosierojn per antaŭaj versioj el viaj dosieroj. Ĉu vi volas gardi la plej freŝajn dosierojn kiel konfliktajn dosierojn?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>Savkopio eltrovita</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>Kutima sinkronigo</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>Konservi la lokajn dosierojn kiel konfliktojn</translation>
</message>
@@ -1484,22 +1412,22 @@ Se vi plu sinkronigas, la sinkronigo anstataŭigos ĉiujn viajn dosierojn per an
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation>Eraro de kunhavigo</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2636,7 +2564,7 @@ Uzi ĝin ne konsilindas.</translation>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>Ignori</translation>
</message>
@@ -2649,22 +2577,17 @@ Uzi ĝin ne konsilindas.</translation>
<translation>Agordoj</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>Aktivaĵoj</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>Ĝenerala</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>Reto</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>Konto</translation>
</message>
@@ -2910,60 +2833,54 @@ Uzi ĝin ne konsilindas.</translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation>Kunhavigi kun %1</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation>Menuo pri kunhavigo</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation>Mi kunhavigis ion kun vi</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation>Opcioj pri kunhavigo</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation>Kopii privatan ligilon al tondujo</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation>Re-kunhavigi ne estas permesata</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation>Kopii publikan ligilon</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation>Kopii internan ligilon</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation>Malfermi per retumilo</translation>
</message>
@@ -3449,7 +3366,7 @@ Uzi ĝin ne konsilindas.</translation>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3457,17 +3374,68 @@ Uzi ĝin ne konsilindas.</translation>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<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>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3504,234 +3472,113 @@ Uzi ĝin ne konsilindas.</translation>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>Bv. ensaluti</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>Dosierujo %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>Neniu sinkroniga dosiero agordita.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>Malfermi per retumilo</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>Elsaluti</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>Ŝanĝitaj antaŭ nelonge</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>Agorditaj dosierujoj:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>Malfermi dosierujon „%1“</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>Malfermi %1 per la retumilo</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>Nekonata stato</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>Helpo</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>Fini %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation>Malkonektita el %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation>Nesubtenata versio de servilo</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>La servilo el la konto %1 uzas malnovan kaj nesubtenatan version. La uzado de tiu ĉi kliento kun nesubtenataj servil-versioj estas ne elprovita kaj eble danĝera. Daŭrigu je via risko.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>Malkonektita</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation>Malkonektita el kelkaj kontoj</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>Malkonektita el la jenaj kontoj:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>Konto %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>Elsalutita</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>Konta sinkronigo estas malebligita</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>Sinkronigo estas paŭzigita</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation>Nesolvitaj konfliktoj</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>Eraro dum sinkronigo</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation>Neniu sinkroniga dosiero agordita</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation>Daŭrigi ĉiujn dosierujon</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>Paŭzigi ĉiujn dosierujon</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation>Daŭrigi ĉiujn sinkronigojn</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation>Daŭrigi sinkronigon</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>Paŭzigi ĉiujn sinkronigojn</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>Paŭzigi sinkronigon</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation>Kraŝi nun</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation>Aplikaĵoj</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>Neniu elemento sinkronigita freŝdate</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation>Kontrolante por ŝanĝoj en fora „%1“</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation>Kontrolante por ŝanĝoj en loka „%1“</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation>Sinkronigo de %1 el %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>Sinkronigo de %1 (%2 restas)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>Sinkronigo de %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>Ĝisdata</translation>
</message>
@@ -4003,7 +3850,7 @@ Uzi ĝin ne konsilindas.</translation>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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 cd61ddb36..db5002e86 100644
--- a/translations/client_es.ts
+++ b/translations/client_es.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>Espacio de almacenamiento: ...</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
@@ -242,230 +242,199 @@
<translation>Conectado a &lt;server&gt; como &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>No se ha configurado ninguna cuenta.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>Añadir nuevo</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>Eliminar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>Cuenta</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation>Esta cuenta soporta cifrado punto a punto</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation>Habilitar cifrado</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation>Mostrar mnemotécnica E2E</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation>Cifrar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation>Editar archivos ignorados</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>Elija qué sincronizar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>Forzar la sincronización ahora</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>Reiniciar sync</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>Eliminar la sincronización de carpetas conectadas</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>Ha fallado la creación de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Confirme la sincronización para la eliminación de la carpeta conectada</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>Eliminar carpeta de sincronización conectada</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>Sincronización en curso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>La sincronización está en curso.&lt;br/&gt;¿Desea interrumpirla?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 como &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>¡La versión del servidor %1 es antigua y no está soportada! Si continúas, lo haces bajo tu propio riesgo.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>Conectado a %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Servidor %1 no está disponible temporalmente.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>El servidor %1 está actualmente en modo mantenimiento.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>Cerró sesión desde %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Obteniendo autorización desde el navegador. &lt;a href=&apos;%1&apos;&gt;Haga clic aquí&lt;/a&gt; para re-abrir el navegador.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>Sin conexión a %1 en %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>Iniciar sesión</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Hay carpetas que no se han sincronizado porque son demasiado grandes:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Hay carpetas que no se han sincronizado porque están en el almacenamiento externo:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Hay carpetas que no se han sincronizado porque son demasiado grandes o están en el almacenamiento externo:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Confirmar eliminación de cuenta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;¿De verdad quiere eliminar la conexión a la cuenta &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Esto &lt;b&gt;no&lt;/b&gt; eliminará los archivos.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>Eliminar conexión</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>Abrir carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>Cerrar sesión</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>Continuar sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>Pausar sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;No pudo crear la carpeta local &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;¿De verdad quiere dejar de sincronizar la carpeta &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Esto &lt;b&gt;no&lt;/b&gt; elminará los archivo.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) de %2 en uso. Algunas carpetas, como carpetas de red o compartidas, podrían tener límites diferentes.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>%1 de %2 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualmente no hay información disponible sobre el uso de almacenamiento.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation>Conectando a %1 ...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>No hay ninguna conexión de %1 configurada.</translation>
</message>
@@ -473,103 +442,62 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>Cerrar sesión</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>Servicio no disponible</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>Modo mantenimiento</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>Error en la red</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>Error en la configuración</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>Solicitando credenciales</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>Estado de cuenta desconocido</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation>Más información</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation>Aceptar</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation>Unirse</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation>Abrir navegador</translation>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation>Los archivos de la la lista de ignorados así como los enlace simbólicos no están sincronizados: Esto incluye:</translation>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation>Aceptar</translation>
- </message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
- <translation>Sincronizado</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation>Reintentar todas las subidas</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br/&gt;La cuenta %1 no tiene actividades habilitadas.</translation>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -680,12 +608,12 @@
<translation>No se ha configurado ninguna cuenta de ownCloud</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>La configuración del servidor para este cliente es demasiado antigua</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Por favor, actualice a la última versión del servidor y reinicie el cliente.</translation>
</message>
@@ -901,36 +829,36 @@
<translation>No se ha podido leer el archivo de exclusión del sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Una carpeta mayor de %1 MB ha sido añadida: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>Una carpeta de almacenamiento externo ha sido añadida.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Por favor vaya a opciones a seleccionarlo si desea descargar esto.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Se ha creado la carpeta %1 pero se excluyó de la sincronización con anterioridad. Los datos en su interior no se sincronizarán.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Se ha creado el archivo %1 pero se excluyó de la sincronización con anterioridad. No se sincronizará.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -943,7 +871,7 @@ Esto significa que el cliente de sincronización podría no subir inmediatamente
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -954,7 +882,7 @@ Si decides restaurar los archivos, si tienes permisos para hacer esto volverán
Si decides eliminar los archivos, no volverás a disponer de ellos, a no ser que seas el propietario.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
@@ -963,22 +891,22 @@ Estos archivos se eliminarán del servidor y no estarán disponibles en tus otro
Si no querías realizar esta acción, ahora se pueden recuperar los datos perdidos.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation>¿Eliminar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation>Eliminar todos los archivos</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation>Recuperar archivos eliminados</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -987,17 +915,17 @@ Esto puede deberse a que una copia de seguridad fue restaurada en el servidor.
Si continua con la sincronización todos los archivos serán remplazados por su versión previa. ¿Desea mantener los archivos locales en su versión actual como archivos en conflicto?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>Backup detectado</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>Sincronización normal</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>Mantener los archivos locales en caso de conflicto</translation>
</message>
@@ -1484,22 +1412,22 @@ Si continua con la sincronización todos los archivos serán remplazados por su
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation>Se requiere contraseña para compartir</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<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/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation>Error al compartir</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2636,7 +2564,7 @@ No se recomienda usarla.</translation>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>Descartar</translation>
</message>
@@ -2649,22 +2577,17 @@ No se recomienda usarla.</translation>
<translation>Ajustes</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>Actividad</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>General</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>Red</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>Cuenta</translation>
</message>
@@ -2910,60 +2833,54 @@ No se recomienda usarla.</translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation>Compartir con %1</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation>Compartir en menú contextual</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation>He compartido algo contigo</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation>Opciones de compartir</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation>Compartir vía %1</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation>Enviar enlace privado por correo electrónico ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation>Copiar enlace privado al portapapeles</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation>No está permitido compartir de nuevo</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation>Copiar enlace público</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation>Copiar enlace interno</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation>Abrir en navegador</translation>
</message>
@@ -3450,7 +3367,7 @@ No se recomienda usarla.</translation>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3458,17 +3375,68 @@ No se recomienda usarla.</translation>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<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>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3505,234 +3473,113 @@ No se recomienda usarla.</translation>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>Por favor, inicie sesión</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>Archivo %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>No hay carpetas configuradas para sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>Abrir en navegador</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>Cerrar sesión</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>Cambios recientes</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>Carpetas administradas:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>Abrir carpeta &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>Abrir %1 en el navegador</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>Estado desconocido</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>Ayuda</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>Salir de %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation>Desconectado de %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation>Versión del servidor no soportada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>El servidor en la cuenta %1 usa una versión antigua y no soportada %2. Usando este cliente con las versiones de servidor no soportadas no está probado y es potencialmente peligroso. Procede bajo tu propio riesgo.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation>Desconectado desde varias cuentas</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>Desconectado desde cuentas:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>Cuenta %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>Cerrar sesión</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>La sincronización está deshabilitada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>La sincronización se ha detenido</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation>Conflictos sin resolver</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>Error durante la sincronización</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation>No hay carpetas sincronizado configuradas</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation>Reanudar todas las carpetas</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>Pausar todas las carpetas</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation>Iniciando sesión ...</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation>Reanudar toda la sincronización</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation>Reanudar la sincronización</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>Pausar todas las sincronizaciones</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>Pausar la sincronización</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Sincronizando %1 de %2 (quedan %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation>Se ha producido un fallo</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation>Apps</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation>Configuración ...</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation>Nueva cuenta ...</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation>Ver más actividad ...</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>No se han sincronizado elementos recientemente</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation>Buscando cambios en la carpeta remota &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation>Buscando cambios en la carpeta local &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation>Sincronizando %1 de %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>Sincronizando %1 (quedan %2)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>Sincronizando %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>Actualizado</translation>
</message>
@@ -4004,7 +3851,7 @@ No se recomienda usarla.</translation>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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 0db3ef1bc..2442d202c 100644
--- a/translations/client_es_AR.ts
+++ b/translations/client_es_AR.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>Espacio de almacenamiento: ...</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
@@ -242,230 +242,199 @@
<translation>Conectado con &lt;server&gt; como &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>No hay cuenta configurada.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>Agregar nuevo</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>Borrar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>Cuenta</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>Elegir que sincronizar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>Forzar sincronización ahora</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>Reinicia sincronización </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>Eliminar conexión de sincronización de carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>Falló la creacion de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Confirmar eliminación de conexión de sincronización de carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>Eliminar Conexión de Sincronización de Carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>Sincronización en curso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>La sincronización está en curso.&lt;br/&gt;¿Querés interrumpirla?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 de &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>¡La versión del servidor% 1 es antigua y no está soportada! Proceda bajo su propio riesgo.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>Conectado a %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>El servidor %1 esta temporalmente sin conexión</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Servidor %1 actualmente en modo mantenimiento.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>Registrado desde %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Obteniendo autorización del navegador. &lt;a href=&apos;%1&apos;&gt;Click aquí&lt;/a&gt; para volver a abrir el navegador.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>Sin conexión a %1 desde %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>Iniciar sesión</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Confirmar la eliminación de la cuenta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>Eliminar conexión</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>Abrir carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>Cerrar la sesión</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>Reanudar sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>Pausar sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Realmente quieres detener la sincronización de la carpeta &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Esto &lt;b&gt;no&lt;/b&gt; eliminara ningun archivo.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>%1 de %2 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualmente no hay información disponible acerca del uso del almacenamiento.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>No hay ninguna conexión de %1 configurada.</translation>
</message>
@@ -473,102 +442,61 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>Desautentificado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>Servicio no disponible</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>Modo mantenimiento</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>Error de red</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>Error de configuración</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>Pidiendo Credenciales</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>Estado de la cuenta desconocido</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation type="unfinished"/>
- </message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
</context>
@@ -680,12 +608,12 @@
<translation>No hay una cuenta ownCloud configurada.</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>La configuración del servidor al cliente es obsoleta</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Por favor actualice a la última versión del servidor y reinicie el cliente.</translation>
</message>
@@ -901,34 +829,34 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -937,7 +865,7 @@ This means that the synchronization client might not upload local changes immedi
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -945,46 +873,46 @@ If you decide to delete the files, they will be unavailable to you, unless you a
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>Sincronizacón Normal.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>Mantener Archivos Locales como Conflicto</translation>
</message>
@@ -1471,22 +1399,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2616,7 +2544,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
@@ -2629,22 +2557,17 @@ It is not advisable to use it.</source>
<translation>Configuración</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>Actividad</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>General</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>Red</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>Cuenta</translation>
</message>
@@ -2890,60 +2813,54 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation type="unfinished"/>
</message>
@@ -3428,7 +3345,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3436,17 +3353,68 @@ It is not advisable to use it.</source>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3483,234 +3451,113 @@ It is not advisable to use it.</source>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>Por favor, inicie sesión</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>Directorio %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>Cerrar la sesión</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>Cambios recientes</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>Directorios administrados:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>Abrir carpeta &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>Abrir %1 en el navegador...</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>Estado desconocido</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>Ayuda</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>Cancelar %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>Desautentificado</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>No se sincronizaron elementos recientemente</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>Sincronizando %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>actualizado</translation>
</message>
@@ -3982,7 +3829,7 @@ It is not advisable to use it.</source>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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 07ebfe233..817548da0 100644
--- a/translations/client_es_CL.ts
+++ b/translations/client_es_CL.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>Espacio de almacenamiento: ...</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
@@ -242,230 +242,199 @@
<translation>Conectado con &lt;server&gt; como &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>No hay cuentas configuradas.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>Agregar nuevo</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>Eliminar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>Cuenta</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>Elige que sincronizar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>Forzar la sincronización ahora</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>Reiniciar sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>Eliminar la conexión de sincronización de carpetas</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>Falló la creación de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Confirmar la Eliminación de la Conexión de Sincronización de Carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>Eliminar la Conexión de Sincronización de la Carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>Sincronización en curso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>La operación de sincronización está en curso. &lt;br/&gt;¿Deseas terminarla?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 como &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>¡La versión del servidor %1 es antigua y no está soportada! Procede bajo tu propio riesgo. </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>Conectado a %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>El servidor %1 se encuntra temporalmente no disponible</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Actualmente el servidor %1 se encuentra en modo mantenimiento.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>Cerraste sesión en %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Obteniendo autorización del navegador. &lt;a href=&apos;%1&apos;&gt;Haz click aquí&lt;/a&gt; para re-abrir el navegador.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>No hay conexión a %1 en %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>Iniciar sesión</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Hay carpetas que no fueron sincronizadas porque son de almacenamiento externo:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Confirma la Remosion de la Cuenta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<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;¿Realmente quieres eliminar la conexión a la cuenta &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Esto &lt;b&gt;no&lt;/b&gt; borrará ningún archivo.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>Eliminar conexión</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>Abrir carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>Salir</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>Reanudar sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>Pausar sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;¿Realmente quieres dejar de sincronizar la carpeta &lt;i&gt;%1&lt;/i&gt;?&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Esto &lt;b&gt;no&lt;/b&gt; borrará ningún archivo.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) de %2 en uso. Algunas carpetas, incluidas carpetas montadas en red o carpetas compartidas, pueden tener diferentes límites</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>%1 de %2 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualmente no hay información disponible del espacio usado.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>No hay %1 conexión configurada. </translation>
</message>
@@ -473,104 +442,63 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>Sesión cerrada</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>Servicio no disponible</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>Modo Mantenimiento</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>Error de red</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>Error de configuración</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>Solicitando Credenciales</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>Estado de la cuenta no conocido</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation type="unfinished"/>
- </message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br/&gt;La cuenta %1 no tiene las actividades habilitadas.</translation>
- </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
@@ -680,12 +608,12 @@
<translation>No se ha configurado alguna cuenta de ownCloud</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>El servidor configurado para este cliente es demasiado antiguo</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Por favor actualiza a la versión más reciente del servidor y reinicia el cliente.</translation>
</message>
@@ -901,36 +829,36 @@
<translation>No fue posible leer el archivo de exclusión del sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Una nueva carpeta de más de %1 MB ha sido agregada: %2
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>Una carpeta de un almacenamiento externo ha sido agregada.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Por favor ve a las configuraciones para seleccionarlo si deseas descargarlo. </translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -939,7 +867,7 @@ This means that the synchronization client might not upload local changes immedi
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -947,29 +875,29 @@ If you decide to delete the files, they will be unavailable to you, unless you a
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -979,17 +907,17 @@ Continuar con la sincronización como normal causará que todos tus archivos sea
¿Quieres mantener tu copia local más reciente como archivos en conflicto?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>Respaldo detectado</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>Sincronización Normal</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>Mantener los Archivos Locales como Conflictos</translation>
</message>
@@ -1476,22 +1404,22 @@ Continuar con la sincronización como normal causará que todos tus archivos sea
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2623,7 +2551,7 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>Descartar</translation>
</message>
@@ -2636,22 +2564,17 @@ No es recomendable usarlo. </translation>
<translation>Configuraciones</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>Actividad</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>General</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>Red</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>Cuenta</translation>
</message>
@@ -2897,60 +2820,54 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation>Te compartí algo</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation>Copiar la liga privada al portapapeles</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation type="unfinished"/>
</message>
@@ -3437,7 +3354,7 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3445,17 +3362,68 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3492,234 +3460,113 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>Por favor inicia sesión</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>Carpeta %1 : %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>No se han configurado carpetas para sincronizar</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>Abrir en el navegador</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>Salir de la sesión</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>Cambios Recientes</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>Carpetas Administradas:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>Abrir carpeta &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>Abrir %1 en el navegador</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>Estado desconocido</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>Ayuda</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>Salir %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation>Desconectado de %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation>Versión del Servidor No Soportada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>El servidor de la cuenta %1 está corriendo una versión antigua y no soportada %2. El uso de este cliente con una versión del servidor no soportada no ha sido probado y es potencialmente peligroso. Procede bajo tu propio riesgo.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation>Desconectado de algunas cuentas</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>Desconectado de las cunetas:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>Cuenta %1 : %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>Sesión cerrada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>La sincronización de cuentas está deshabilitada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>La sincronización está pausada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>Error durante la sincronización</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation>No se han configurado carpetas de sincronización</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>Pausar las carpetas</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>Pausar toda la sincronización</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>Pausar sincronización</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation>Falla ahora</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>No se han sincronizado elementos recientemente</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation>Sincronizando %1 de %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>Sincronizando %1 (faltan %2)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>Sincronizando %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>Actualizado</translation>
</message>
@@ -3991,7 +3838,7 @@ No es recomendable usarlo. </translation>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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 a1c959f40..41c4750cb 100644
--- a/translations/client_es_CO.ts
+++ b/translations/client_es_CO.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>Espacio de almacenamiento: ...</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
@@ -242,230 +242,199 @@
<translation>Conectado con &lt;server&gt; como &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>No hay cuentas configuradas.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>Agregar nuevo</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>Eliminar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>Cuenta</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>Elige que sincronizar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>Forzar la sincronización ahora</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>Reiniciar sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>Eliminar la conexión de sincronización de carpetas</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>Falló la creación de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Confirmar la Eliminación de la Conexión de Sincronización de Carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>Eliminar la Conexión de Sincronización de la Carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>Sincronización en curso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>La operación de sincronización está en curso. &lt;br/&gt;¿Deseas terminarla?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 como &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>¡La versión del servidor %1 es antigua y no está soportada! Procede bajo tu propio riesgo. </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>Conectado a %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>El servidor %1 se encuntra temporalmente no disponible</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Actualmente el servidor %1 se encuentra en modo mantenimiento.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>Cerraste sesión en %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Obteniendo autorización del navegador. &lt;a href=&apos;%1&apos;&gt;Haz click aquí&lt;/a&gt; para re-abrir el navegador.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>No hay conexión a %1 en %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>Iniciar sesión</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Hay carpetas que no fueron sincronizadas porque son de almacenamiento externo:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Confirma la Remosion de la Cuenta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<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;¿Realmente quieres eliminar la conexión a la cuenta &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Esto &lt;b&gt;no&lt;/b&gt; borrará ningún archivo.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>Eliminar conexión</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>Abrir carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>Salir</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>Reanudar sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>Pausar sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;¿Realmente quieres dejar de sincronizar la carpeta &lt;i&gt;%1&lt;/i&gt;?&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Esto &lt;b&gt;no&lt;/b&gt; borrará ningún archivo.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) de %2 en uso. Algunas carpetas, incluidas carpetas montadas en red o carpetas compartidas, pueden tener diferentes límites</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>%1 de %2 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualmente no hay información disponible del espacio usado.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>No hay %1 conexión configurada. </translation>
</message>
@@ -473,104 +442,63 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>Sesión cerrada</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>Servicio no disponible</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>Modo Mantenimiento</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>Error de red</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>Error de configuración</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>Solicitando Credenciales</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>Estado de la cuenta no conocido</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation type="unfinished"/>
- </message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br/&gt;La cuenta %1 no tiene las actividades habilitadas.</translation>
- </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
@@ -680,12 +608,12 @@
<translation>No se ha configurado alguna cuenta de ownCloud</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>El servidor configurado para este cliente es demasiado antiguo</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Por favor actualiza a la versión más reciente del servidor y reinicia el cliente.</translation>
</message>
@@ -901,36 +829,36 @@
<translation>No fue posible leer el archivo de exclusión del sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Una nueva carpeta de más de %1 MB ha sido agregada: %2
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>Una carpeta de un almacenamiento externo ha sido agregada.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Por favor ve a las configuraciones para seleccionarlo si deseas descargarlo. </translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -939,7 +867,7 @@ This means that the synchronization client might not upload local changes immedi
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -947,29 +875,29 @@ If you decide to delete the files, they will be unavailable to you, unless you a
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -979,17 +907,17 @@ Continuar con la sincronización como normal causará que todos tus archivos sea
¿Quieres mantener tu copia local más reciente como archivos en conflicto?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>Respaldo detectado</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>Sincronización Normal</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>Mantener los Archivos Locales como Conflictos</translation>
</message>
@@ -1476,22 +1404,22 @@ Continuar con la sincronización como normal causará que todos tus archivos sea
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2623,7 +2551,7 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>Descartar</translation>
</message>
@@ -2636,22 +2564,17 @@ No es recomendable usarlo. </translation>
<translation>Configuraciones</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>Actividad</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>General</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>Red</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>Cuenta</translation>
</message>
@@ -2897,60 +2820,54 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation>Te compartí algo</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation>Copiar la liga privada al portapapeles</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation type="unfinished"/>
</message>
@@ -3437,7 +3354,7 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3445,17 +3362,68 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3492,234 +3460,113 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>Por favor inicia sesión</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>Carpeta %1 : %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>No se han configurado carpetas para sincronizar</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>Abrir en el navegador</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>Salir de la sesión</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>Cambios Recientes</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>Carpetas Administradas:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>Abrir carpeta &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>Abrir %1 en el navegador</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>Estado desconocido</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>Ayuda</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>Salir %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation>Desconectado de %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation>Versión del Servidor No Soportada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>El servidor de la cuenta %1 está corriendo una versión antigua y no soportada %2. El uso de este cliente con una versión del servidor no soportada no ha sido probado y es potencialmente peligroso. Procede bajo tu propio riesgo.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation>Desconectado de algunas cuentas</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>Desconectado de las cunetas:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>Cuenta %1 : %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>Sesión cerrada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>La sincronización de cuentas está deshabilitada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>La sincronización está pausada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>Error durante la sincronización</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation>No se han configurado carpetas de sincronización</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>Pausar las carpetas</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>Pausar toda la sincronización</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>Pausar sincronización</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation>Falla ahora</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>No se han sincronizado elementos recientemente</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation>Sincronizando %1 de %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>Sincronizando %1 (faltan %2)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>Sincronizando %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>Actualizado</translation>
</message>
@@ -3991,7 +3838,7 @@ No es recomendable usarlo. </translation>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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 929347513..602cbf290 100644
--- a/translations/client_es_CR.ts
+++ b/translations/client_es_CR.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>Espacio de almacenamiento: ...</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
@@ -242,230 +242,199 @@
<translation>Conectado con &lt;server&gt; como &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>No hay cuentas configuradas.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>Agregar nuevo</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>Eliminar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>Cuenta</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>Elige que sincronizar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>Forzar la sincronización ahora</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>Reiniciar sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>Eliminar la conexión de sincronización de carpetas</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>Falló la creación de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Confirmar la Eliminación de la Conexión de Sincronización de Carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>Eliminar la Conexión de Sincronización de la Carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>Sincronización en curso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>La operación de sincronización está en curso. &lt;br/&gt;¿Deseas terminarla?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 como &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>¡La versión del servidor %1 es antigua y no está soportada! Procede bajo tu propio riesgo. </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>Conectado a %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>El servidor %1 se encuntra temporalmente no disponible</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Actualmente el servidor %1 se encuentra en modo mantenimiento.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>Cerraste sesión en %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Obteniendo autorización del navegador. &lt;a href=&apos;%1&apos;&gt;Haz click aquí&lt;/a&gt; para re-abrir el navegador.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>No hay conexión a %1 en %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>Iniciar sesión</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Hay carpetas que no fueron sincronizadas porque son de almacenamiento externo:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Confirma la Remosion de la Cuenta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<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;¿Realmente quieres eliminar la conexión a la cuenta &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Esto &lt;b&gt;no&lt;/b&gt; borrará ningún archivo.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>Eliminar conexión</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>Abrir carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>Salir</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>Reanudar sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>Pausar sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;¿Realmente quieres dejar de sincronizar la carpeta &lt;i&gt;%1&lt;/i&gt;?&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Esto &lt;b&gt;no&lt;/b&gt; borrará ningún archivo.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) de %2 en uso. Algunas carpetas, incluidas carpetas montadas en red o carpetas compartidas, pueden tener diferentes límites</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>%1 de %2 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualmente no hay información disponible del espacio usado.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>No hay %1 conexión configurada. </translation>
</message>
@@ -473,104 +442,63 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>Sesión cerrada</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>Servicio no disponible</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>Modo Mantenimiento</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>Error de red</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>Error de configuración</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>Solicitando Credenciales</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>Estado de la cuenta no conocido</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation type="unfinished"/>
- </message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br/&gt;La cuenta %1 no tiene las actividades habilitadas.</translation>
- </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
@@ -680,12 +608,12 @@
<translation>No se ha configurado alguna cuenta de ownCloud</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>El servidor configurado para este cliente es demasiado antiguo</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Por favor actualiza a la versión más reciente del servidor y reinicia el cliente.</translation>
</message>
@@ -901,36 +829,36 @@
<translation>No fue posible leer el archivo de exclusión del sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Una nueva carpeta de más de %1 MB ha sido agregada: %2
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>Una carpeta de un almacenamiento externo ha sido agregada.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Por favor ve a las configuraciones para seleccionarlo si deseas descargarlo. </translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -939,7 +867,7 @@ This means that the synchronization client might not upload local changes immedi
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -947,29 +875,29 @@ If you decide to delete the files, they will be unavailable to you, unless you a
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -979,17 +907,17 @@ Continuar con la sincronización como normal causará que todos tus archivos sea
¿Quieres mantener tu copia local más reciente como archivos en conflicto?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>Respaldo detectado</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>Sincronización Normal</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>Mantener los Archivos Locales como Conflictos</translation>
</message>
@@ -1476,22 +1404,22 @@ Continuar con la sincronización como normal causará que todos tus archivos sea
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2623,7 +2551,7 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>Descartar</translation>
</message>
@@ -2636,22 +2564,17 @@ No es recomendable usarlo. </translation>
<translation>Configuraciones</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>Actividad</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>General</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>Red</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>Cuenta</translation>
</message>
@@ -2897,60 +2820,54 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation>Te compartí algo</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation>Copiar la liga privada al portapapeles</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation type="unfinished"/>
</message>
@@ -3437,7 +3354,7 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3445,17 +3362,68 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3492,234 +3460,113 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>Por favor inicia sesión</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>Carpeta %1 : %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>No se han configurado carpetas para sincronizar</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>Abrir en el navegador</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>Salir de la sesión</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>Cambios Recientes</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>Carpetas Administradas:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>Abrir carpeta &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>Abrir %1 en el navegador</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>Estado desconocido</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>Ayuda</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>Salir %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation>Desconectado de %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation>Versión del Servidor No Soportada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>El servidor de la cuenta %1 está corriendo una versión antigua y no soportada %2. El uso de este cliente con una versión del servidor no soportada no ha sido probado y es potencialmente peligroso. Procede bajo tu propio riesgo.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation>Desconectado de algunas cuentas</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>Desconectado de las cunetas:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>Cuenta %1 : %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>Sesión cerrada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>La sincronización de cuentas está deshabilitada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>La sincronización está pausada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>Error durante la sincronización</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation>No se han configurado carpetas de sincronización</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>Pausar las carpetas</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>Pausar toda la sincronización</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>Pausar sincronización</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation>Falla ahora</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>No se han sincronizado elementos recientemente</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation>Sincronizando %1 de %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>Sincronizando %1 (faltan %2)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>Sincronizando %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>Actualizado</translation>
</message>
@@ -3991,7 +3838,7 @@ No es recomendable usarlo. </translation>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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 819cd70dc..b3094ede0 100644
--- a/translations/client_es_DO.ts
+++ b/translations/client_es_DO.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>Espacio de almacenamiento: ...</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
@@ -242,230 +242,199 @@
<translation>Conectado con &lt;server&gt; como &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>No hay cuentas configuradas.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>Agregar nuevo</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>Eliminar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>Cuenta</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>Elige que sincronizar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>Forzar la sincronización ahora</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>Reiniciar sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>Eliminar la conexión de sincronización de carpetas</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>Falló la creación de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Confirmar la Eliminación de la Conexión de Sincronización de Carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>Eliminar la Conexión de Sincronización de la Carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>Sincronización en curso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>La operación de sincronización está en curso. &lt;br/&gt;¿Deseas terminarla?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 como &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>¡La versión del servidor %1 es antigua y no está soportada! Procede bajo tu propio riesgo. </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>Conectado a %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>El servidor %1 se encuntra temporalmente no disponible</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Actualmente el servidor %1 se encuentra en modo mantenimiento.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>Cerraste sesión en %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Obteniendo autorización del navegador. &lt;a href=&apos;%1&apos;&gt;Haz click aquí&lt;/a&gt; para re-abrir el navegador.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>No hay conexión a %1 en %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>Iniciar sesión</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Hay carpetas que no fueron sincronizadas porque son de almacenamiento externo:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Confirma la Remosion de la Cuenta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<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;¿Realmente quieres eliminar la conexión a la cuenta &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Esto &lt;b&gt;no&lt;/b&gt; borrará ningún archivo.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>Eliminar conexión</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>Abrir carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>Salir</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>Reanudar sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>Pausar sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;¿Realmente quieres dejar de sincronizar la carpeta &lt;i&gt;%1&lt;/i&gt;?&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Esto &lt;b&gt;no&lt;/b&gt; borrará ningún archivo.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) de %2 en uso. Algunas carpetas, incluidas carpetas montadas en red o carpetas compartidas, pueden tener diferentes límites</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>%1 de %2 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualmente no hay información disponible del espacio usado.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>No hay %1 conexión configurada. </translation>
</message>
@@ -473,104 +442,63 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>Sesión cerrada</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>Servicio no disponible</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>Modo Mantenimiento</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>Error de red</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>Error de configuración</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>Solicitando Credenciales</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>Estado de la cuenta no conocido</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation type="unfinished"/>
- </message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br/&gt;La cuenta %1 no tiene las actividades habilitadas.</translation>
- </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
@@ -680,12 +608,12 @@
<translation>No se ha configurado alguna cuenta de ownCloud</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>El servidor configurado para este cliente es demasiado antiguo</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Por favor actualiza a la versión más reciente del servidor y reinicia el cliente.</translation>
</message>
@@ -901,36 +829,36 @@
<translation>No fue posible leer el archivo de exclusión del sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Una nueva carpeta de más de %1 MB ha sido agregada: %2
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>Una carpeta de un almacenamiento externo ha sido agregada.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Por favor ve a las configuraciones para seleccionarlo si deseas descargarlo. </translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -939,7 +867,7 @@ This means that the synchronization client might not upload local changes immedi
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -947,29 +875,29 @@ If you decide to delete the files, they will be unavailable to you, unless you a
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -979,17 +907,17 @@ Continuar con la sincronización como normal causará que todos tus archivos sea
¿Quieres mantener tu copia local más reciente como archivos en conflicto?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>Respaldo detectado</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>Sincronización Normal</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>Mantener los Archivos Locales como Conflictos</translation>
</message>
@@ -1476,22 +1404,22 @@ Continuar con la sincronización como normal causará que todos tus archivos sea
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2623,7 +2551,7 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>Descartar</translation>
</message>
@@ -2636,22 +2564,17 @@ No es recomendable usarlo. </translation>
<translation>Configuraciones</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>Actividad</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>General</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>Red</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>Cuenta</translation>
</message>
@@ -2897,60 +2820,54 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation>Te compartí algo</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation>Copiar la liga privada al portapapeles</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation type="unfinished"/>
</message>
@@ -3437,7 +3354,7 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3445,17 +3362,68 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3492,234 +3460,113 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>Por favor inicia sesión</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>Carpeta %1 : %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>No se han configurado carpetas para sincronizar</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>Abrir en el navegador</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>Salir de la sesión</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>Cambios Recientes</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>Carpetas Administradas:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>Abrir carpeta &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>Abrir %1 en el navegador</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>Estado desconocido</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>Ayuda</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>Salir %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation>Desconectado de %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation>Versión del Servidor No Soportada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>El servidor de la cuenta %1 está corriendo una versión antigua y no soportada %2. El uso de este cliente con una versión del servidor no soportada no ha sido probado y es potencialmente peligroso. Procede bajo tu propio riesgo.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation>Desconectado de algunas cuentas</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>Desconectado de las cunetas:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>Cuenta %1 : %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>Sesión cerrada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>La sincronización de cuentas está deshabilitada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>La sincronización está pausada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>Error durante la sincronización</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation>No se han configurado carpetas de sincronización</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>Pausar las carpetas</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>Pausar toda la sincronización</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>Pausar sincronización</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation>Falla ahora</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>No se han sincronizado elementos recientemente</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation>Sincronizando %1 de %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>Sincronizando %1 (faltan %2)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>Sincronizando %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>Actualizado</translation>
</message>
@@ -3991,7 +3838,7 @@ No es recomendable usarlo. </translation>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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 0de7a60d0..cee53a335 100644
--- a/translations/client_es_EC.ts
+++ b/translations/client_es_EC.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>Espacio de almacenamiento: ...</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
@@ -242,230 +242,199 @@
<translation>Conectado con &lt;server&gt; como &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>No hay cuentas configuradas.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>Agregar nuevo</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>Eliminar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>Cuenta</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>Elige que sincronizar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>Forzar la sincronización ahora</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>Reiniciar sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>Eliminar la conexión de sincronización de carpetas</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>Falló la creación de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Confirmar la Eliminación de la Conexión de Sincronización de Carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>Eliminar la Conexión de Sincronización de la Carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>Sincronización en curso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>La operación de sincronización está en curso. &lt;br/&gt;¿Deseas terminarla?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 como &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>¡La versión del servidor %1 es antigua y no está soportada! Procede bajo tu propio riesgo. </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>Conectado a %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>El servidor %1 se encuntra temporalmente no disponible</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Actualmente el servidor %1 se encuentra en modo mantenimiento.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>Cerraste sesión en %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Obteniendo autorización del navegador. &lt;a href=&apos;%1&apos;&gt;Haz click aquí&lt;/a&gt; para re-abrir el navegador.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>No hay conexión a %1 en %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>Iniciar sesión</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Hay carpetas que no fueron sincronizadas porque son de almacenamiento externo:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Confirma la Remosion de la Cuenta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<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;¿Realmente quieres eliminar la conexión a la cuenta &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Esto &lt;b&gt;no&lt;/b&gt; borrará ningún archivo.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>Eliminar conexión</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>Abrir carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>Salir</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>Reanudar sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>Pausar sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;¿Realmente quieres dejar de sincronizar la carpeta &lt;i&gt;%1&lt;/i&gt;?&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Esto &lt;b&gt;no&lt;/b&gt; borrará ningún archivo.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) de %2 en uso. Algunas carpetas, incluidas carpetas montadas en red o carpetas compartidas, pueden tener diferentes límites</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>%1 de %2 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualmente no hay información disponible del espacio usado.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>No hay %1 conexión configurada. </translation>
</message>
@@ -473,104 +442,63 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>Sesión cerrada</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>Servicio no disponible</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>Modo Mantenimiento</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>Error de red</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>Error de configuración</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>Solicitando Credenciales</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>Estado de la cuenta no conocido</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation type="unfinished"/>
- </message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br/&gt;La cuenta %1 no tiene las actividades habilitadas.</translation>
- </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
@@ -680,12 +608,12 @@
<translation>No se ha configurado alguna cuenta de ownCloud</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>El servidor configurado para este cliente es demasiado antiguo</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Por favor actualiza a la versión más reciente del servidor y reinicia el cliente.</translation>
</message>
@@ -901,36 +829,36 @@
<translation>No fue posible leer el archivo de exclusión del sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Una nueva carpeta de más de %1 MB ha sido agregada: %2
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>Una carpeta de un almacenamiento externo ha sido agregada.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Por favor ve a las configuraciones para seleccionarlo si deseas descargarlo. </translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -939,7 +867,7 @@ This means that the synchronization client might not upload local changes immedi
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -947,29 +875,29 @@ If you decide to delete the files, they will be unavailable to you, unless you a
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -979,17 +907,17 @@ Continuar con la sincronización como normal causará que todos tus archivos sea
¿Quieres mantener tu copia local más reciente como archivos en conflicto?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>Respaldo detectado</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>Sincronización Normal</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>Mantener los Archivos Locales como Conflictos</translation>
</message>
@@ -1476,22 +1404,22 @@ Continuar con la sincronización como normal causará que todos tus archivos sea
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2623,7 +2551,7 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>Descartar</translation>
</message>
@@ -2636,22 +2564,17 @@ No es recomendable usarlo. </translation>
<translation>Configuraciones</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>Actividad</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>General</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>Red</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>Cuenta</translation>
</message>
@@ -2897,60 +2820,54 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation>Te compartí algo</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation>Copiar la liga privada al portapapeles</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation type="unfinished"/>
</message>
@@ -3437,7 +3354,7 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3445,17 +3362,68 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3492,234 +3460,113 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>Por favor inicia sesión</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>Carpeta %1 : %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>No se han configurado carpetas para sincronizar</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>Abrir en el navegador</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>Salir de la sesión</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>Cambios Recientes</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>Carpetas Administradas:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>Abrir carpeta &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>Abrir %1 en el navegador</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>Estado desconocido</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>Ayuda</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>Salir %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation>Desconectado de %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation>Versión del Servidor No Soportada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>El servidor de la cuenta %1 está corriendo una versión antigua y no soportada %2. El uso de este cliente con una versión del servidor no soportada no ha sido probado y es potencialmente peligroso. Procede bajo tu propio riesgo.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation>Desconectado de algunas cuentas</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>Desconectado de las cunetas:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>Cuenta %1 : %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>Sesión cerrada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>La sincronización de cuentas está deshabilitada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>La sincronización está pausada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>Error durante la sincronización</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation>No se han configurado carpetas de sincronización</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>Pausar las carpetas</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>Pausar toda la sincronización</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>Pausar sincronización</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation>Falla ahora</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>No se han sincronizado elementos recientemente</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation>Sincronizando %1 de %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>Sincronizando %1 (faltan %2)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>Sincronizando %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>Actualizado</translation>
</message>
@@ -3991,7 +3838,7 @@ No es recomendable usarlo. </translation>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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 03ea24cb8..b6b54d2ef 100644
--- a/translations/client_es_GT.ts
+++ b/translations/client_es_GT.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>Espacio de almacenamiento: ...</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
@@ -242,230 +242,199 @@
<translation>Conectado con &lt;server&gt; como &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>No hay cuentas configuradas.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>Agregar nuevo</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>Eliminar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>Cuenta</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>Elige que sincronizar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>Forzar la sincronización ahora</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>Reiniciar sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>Eliminar la conexión de sincronización de carpetas</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>Falló la creación de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Confirmar la Eliminación de la Conexión de Sincronización de Carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>Eliminar la Conexión de Sincronización de la Carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>Sincronización en curso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>La operación de sincronización está en curso. &lt;br/&gt;¿Deseas terminarla?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 como &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>¡La versión del servidor %1 es antigua y no está soportada! Procede bajo tu propio riesgo. </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>Conectado a %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>El servidor %1 se encuntra temporalmente no disponible</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Actualmente el servidor %1 se encuentra en modo mantenimiento.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>Cerraste sesión en %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Obteniendo autorización del navegador. &lt;a href=&apos;%1&apos;&gt;Haz click aquí&lt;/a&gt; para re-abrir el navegador.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>No hay conexión a %1 en %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>Iniciar sesión</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Hay carpetas que no fueron sincronizadas porque son de almacenamiento externo:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Confirma la Remosion de la Cuenta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<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;¿Realmente quieres eliminar la conexión a la cuenta &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Esto &lt;b&gt;no&lt;/b&gt; borrará ningún archivo.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>Eliminar conexión</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>Abrir carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>Salir</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>Reanudar sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>Pausar sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;¿Realmente quieres dejar de sincronizar la carpeta &lt;i&gt;%1&lt;/i&gt;?&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Esto &lt;b&gt;no&lt;/b&gt; borrará ningún archivo.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) de %2 en uso. Algunas carpetas, incluidas carpetas montadas en red o carpetas compartidas, pueden tener diferentes límites</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>%1 de %2 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualmente no hay información disponible del espacio usado.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>No hay %1 conexión configurada. </translation>
</message>
@@ -473,104 +442,63 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>Sesión cerrada</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>Servicio no disponible</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>Modo Mantenimiento</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>Error de red</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>Error de configuración</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>Solicitando Credenciales</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>Estado de la cuenta no conocido</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation type="unfinished"/>
- </message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br/&gt;La cuenta %1 no tiene las actividades habilitadas.</translation>
- </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
@@ -680,12 +608,12 @@
<translation>No se ha configurado alguna cuenta de ownCloud</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>El servidor configurado para este cliente es demasiado antiguo</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Por favor actualiza a la versión más reciente del servidor y reinicia el cliente.</translation>
</message>
@@ -901,36 +829,36 @@
<translation>No fue posible leer el archivo de exclusión del sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Una nueva carpeta de más de %1 MB ha sido agregada: %2
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>Una carpeta de un almacenamiento externo ha sido agregada.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Por favor ve a las configuraciones para seleccionarlo si deseas descargarlo. </translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -939,7 +867,7 @@ This means that the synchronization client might not upload local changes immedi
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -947,29 +875,29 @@ If you decide to delete the files, they will be unavailable to you, unless you a
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -979,17 +907,17 @@ Continuar con la sincronización como normal causará que todos tus archivos sea
¿Quieres mantener tu copia local más reciente como archivos en conflicto?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>Respaldo detectado</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>Sincronización Normal</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>Mantener los Archivos Locales como Conflictos</translation>
</message>
@@ -1476,22 +1404,22 @@ Continuar con la sincronización como normal causará que todos tus archivos sea
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2623,7 +2551,7 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>Descartar</translation>
</message>
@@ -2636,22 +2564,17 @@ No es recomendable usarlo. </translation>
<translation>Configuraciones</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>Actividad</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>General</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>Red</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>Cuenta</translation>
</message>
@@ -2897,60 +2820,54 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation>Te compartí algo</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation>Copiar la liga privada al portapapeles</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation type="unfinished"/>
</message>
@@ -3437,7 +3354,7 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3445,17 +3362,68 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3492,234 +3460,113 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>Por favor inicia sesión</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>Carpeta %1 : %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>No se han configurado carpetas para sincronizar</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>Abrir en el navegador</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>Salir de la sesión</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>Cambios Recientes</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>Carpetas Administradas:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>Abrir carpeta &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>Abrir %1 en el navegador</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>Estado desconocido</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>Ayuda</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>Salir %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation>Desconectado de %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation>Versión del Servidor No Soportada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>El servidor de la cuenta %1 está corriendo una versión antigua y no soportada %2. El uso de este cliente con una versión del servidor no soportada no ha sido probado y es potencialmente peligroso. Procede bajo tu propio riesgo.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation>Desconectado de algunas cuentas</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>Desconectado de las cunetas:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>Cuenta %1 : %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>Sesión cerrada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>La sincronización de cuentas está deshabilitada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>La sincronización está pausada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>Error durante la sincronización</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation>No se han configurado carpetas de sincronización</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>Pausar las carpetas</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>Pausar toda la sincronización</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>Pausar sincronización</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation>Falla ahora</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>No se han sincronizado elementos recientemente</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation>Sincronizando %1 de %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>Sincronizando %1 (faltan %2)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>Sincronizando %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>Actualizado</translation>
</message>
@@ -3991,7 +3838,7 @@ No es recomendable usarlo. </translation>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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 df41d78c2..8369481a4 100644
--- a/translations/client_es_HN.ts
+++ b/translations/client_es_HN.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>Espacio de almacenamiento: ...</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
@@ -242,230 +242,199 @@
<translation>Conectado con &lt;server&gt; como &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>No hay cuentas configuradas.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>Agregar nuevo</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>Eliminar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>Cuenta</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>Elige que sincronizar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>Forzar la sincronización ahora</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>Reiniciar sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>Eliminar la conexión de sincronización de carpetas</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>Falló la creación de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Confirmar la Eliminación de la Conexión de Sincronización de Carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>Eliminar la Conexión de Sincronización de la Carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>Sincronización en curso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>La operación de sincronización está en curso. &lt;br/&gt;¿Deseas terminarla?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 como &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>¡La versión del servidor %1 es antigua y no está soportada! Procede bajo tu propio riesgo. </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>Conectado a %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>El servidor %1 se encuntra temporalmente no disponible</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Actualmente el servidor %1 se encuentra en modo mantenimiento.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>Cerraste sesión en %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Obteniendo autorización del navegador. &lt;a href=&apos;%1&apos;&gt;Haz click aquí&lt;/a&gt; para re-abrir el navegador.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>No hay conexión a %1 en %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>Iniciar sesión</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Hay carpetas que no fueron sincronizadas porque son de almacenamiento externo:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Confirma la Remosion de la Cuenta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<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;¿Realmente quieres eliminar la conexión a la cuenta &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Esto &lt;b&gt;no&lt;/b&gt; borrará ningún archivo.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>Eliminar conexión</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>Abrir carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>Salir</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>Reanudar sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>Pausar sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;¿Realmente quieres dejar de sincronizar la carpeta &lt;i&gt;%1&lt;/i&gt;?&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Esto &lt;b&gt;no&lt;/b&gt; borrará ningún archivo.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) de %2 en uso. Algunas carpetas, incluidas carpetas montadas en red o carpetas compartidas, pueden tener diferentes límites</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>%1 de %2 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualmente no hay información disponible del espacio usado.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>No hay %1 conexión configurada. </translation>
</message>
@@ -473,104 +442,63 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>Sesión cerrada</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>Servicio no disponible</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>Modo Mantenimiento</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>Error de red</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>Error de configuración</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>Solicitando Credenciales</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>Estado de la cuenta no conocido</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation type="unfinished"/>
- </message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br/&gt;La cuenta %1 no tiene las actividades habilitadas.</translation>
- </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
@@ -680,12 +608,12 @@
<translation>No se ha configurado alguna cuenta de ownCloud</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>El servidor configurado para este cliente es demasiado antiguo</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Por favor actualiza a la versión más reciente del servidor y reinicia el cliente.</translation>
</message>
@@ -901,36 +829,36 @@
<translation>No fue posible leer el archivo de exclusión del sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Una nueva carpeta de más de %1 MB ha sido agregada: %2
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>Una carpeta de un almacenamiento externo ha sido agregada.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Por favor ve a las configuraciones para seleccionarlo si deseas descargarlo. </translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -939,7 +867,7 @@ This means that the synchronization client might not upload local changes immedi
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -947,29 +875,29 @@ If you decide to delete the files, they will be unavailable to you, unless you a
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -979,17 +907,17 @@ Continuar con la sincronización como normal causará que todos tus archivos sea
¿Quieres mantener tu copia local más reciente como archivos en conflicto?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>Respaldo detectado</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>Sincronización Normal</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>Mantener los Archivos Locales como Conflictos</translation>
</message>
@@ -1476,22 +1404,22 @@ Continuar con la sincronización como normal causará que todos tus archivos sea
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2623,7 +2551,7 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>Descartar</translation>
</message>
@@ -2636,22 +2564,17 @@ No es recomendable usarlo. </translation>
<translation>Configuraciones</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>Actividad</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>General</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>Red</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>Cuenta</translation>
</message>
@@ -2897,60 +2820,54 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation>Te compartí algo</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation>Copiar la liga privada al portapapeles</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation type="unfinished"/>
</message>
@@ -3437,7 +3354,7 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3445,17 +3362,68 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3492,234 +3460,113 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>Por favor inicia sesión</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>Carpeta %1 : %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>No se han configurado carpetas para sincronizar</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>Abrir en el navegador</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>Salir de la sesión</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>Cambios Recientes</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>Carpetas Administradas:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>Abrir carpeta &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>Abrir %1 en el navegador</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>Estado desconocido</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>Ayuda</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>Salir %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation>Desconectado de %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation>Versión del Servidor No Soportada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>El servidor de la cuenta %1 está corriendo una versión antigua y no soportada %2. El uso de este cliente con una versión del servidor no soportada no ha sido probado y es potencialmente peligroso. Procede bajo tu propio riesgo.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation>Desconectado de algunas cuentas</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>Desconectado de las cunetas:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>Cuenta %1 : %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>Sesión cerrada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>La sincronización de cuentas está deshabilitada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>La sincronización está pausada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>Error durante la sincronización</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation>No se han configurado carpetas de sincronización</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>Pausar las carpetas</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>Pausar toda la sincronización</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>Pausar sincronización</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation>Falla ahora</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>No se han sincronizado elementos recientemente</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation>Sincronizando %1 de %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>Sincronizando %1 (faltan %2)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>Sincronizando %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>Actualizado</translation>
</message>
@@ -3991,7 +3838,7 @@ No es recomendable usarlo. </translation>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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 cb36efda8..c257c8759 100644
--- a/translations/client_es_MX.ts
+++ b/translations/client_es_MX.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>Espacio de almacenamiento: ...</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
@@ -242,230 +242,199 @@
<translation>Conectado con &lt;server&gt; como &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>No hay cuentas configuradas.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>Agregar nuevo</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>Eliminar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>Cuenta</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>Elige que sincronizar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>Forzar la sincronización ahora</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>Reiniciar sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>Eliminar la conexión de sincronización de carpetas</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>Falló la creación de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Confirmar la Eliminación de la Conexión de Sincronización de Carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>Eliminar la Conexión de Sincronización de la Carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>Sincronización en curso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>La operación de sincronización está en curso. &lt;br/&gt;¿Deseas terminarla?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 como &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>¡La versión del servidor %1 es antigua y no está soportada! Procede bajo tu propio riesgo. </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>Conectado a %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>El servidor %1 se encuntra temporalmente no disponible</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Actualmente el servidor %1 se encuentra en modo mantenimiento.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>Cerraste sesión en %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Obteniendo autorización del navegador. &lt;a href=&apos;%1&apos;&gt;Haz click aquí&lt;/a&gt; para re-abrir el navegador.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>No hay conexión a %1 en %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>Iniciar sesión</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Hay carpetas que no fueron sincronizadas porque son de almacenamiento externo:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Confirma la Remosion de la Cuenta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<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;¿Realmente quieres eliminar la conexión a la cuenta &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Esto &lt;b&gt;no&lt;/b&gt; borrará ningún archivo.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>Eliminar conexión</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>Abrir carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>Salir</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>Reanudar sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>Pausar sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;¿Realmente quieres dejar de sincronizar la carpeta &lt;i&gt;%1&lt;/i&gt;?&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Esto &lt;b&gt;no&lt;/b&gt; borrará ningún archivo.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) de %2 en uso. Algunas carpetas, incluidas carpetas montadas en red o carpetas compartidas, pueden tener diferentes límites</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>%1 de %2 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualmente no hay información disponible del espacio usado.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>No hay %1 conexión configurada. </translation>
</message>
@@ -473,104 +442,63 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>Sesión cerrada</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>Servicio no disponible</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>Modo Mantenimiento</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>Error de red</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>Error de configuración</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>Solicitando Credenciales</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>Estado de la cuenta no conocido</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation type="unfinished"/>
- </message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br/&gt;La cuenta %1 no tiene las actividades habilitadas.</translation>
- </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
@@ -680,12 +608,12 @@
<translation>No se ha configurado alguna cuenta de ownCloud</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>El servidor configurado para este cliente es demasiado antiguo</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Por favor actualiza a la versión más reciente del servidor y reinicia el cliente.</translation>
</message>
@@ -901,36 +829,36 @@
<translation>No fue posible leer el archivo de exclusión del sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Una nueva carpeta de más de %1 MB ha sido agregada: %2
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>Una carpeta de un almacenamiento externo ha sido agregada.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Por favor ve a las configuraciones para seleccionarlo si deseas descargarlo. </translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -939,7 +867,7 @@ This means that the synchronization client might not upload local changes immedi
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -947,29 +875,29 @@ If you decide to delete the files, they will be unavailable to you, unless you a
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -979,17 +907,17 @@ Continuar con la sincronización como normal causará que todos tus archivos sea
¿Quieres mantener tu copia local más reciente como archivos en conflicto?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>Respaldo detectado</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>Sincronización Normal</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>Mantener los Archivos Locales como Conflictos</translation>
</message>
@@ -1476,22 +1404,22 @@ Continuar con la sincronización como normal causará que todos tus archivos sea
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2623,7 +2551,7 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>Descartar</translation>
</message>
@@ -2636,22 +2564,17 @@ No es recomendable usarlo. </translation>
<translation>Configuraciones</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>Actividad</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>General</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>Red</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>Cuenta</translation>
</message>
@@ -2897,60 +2820,54 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation>Te compartí algo</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation>Copiar la liga privada al portapapeles</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation type="unfinished"/>
</message>
@@ -3437,7 +3354,7 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3445,17 +3362,68 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3492,234 +3460,113 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>Por favor inicia sesión</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>Carpeta %1 : %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>No se han configurado carpetas para sincronizar</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>Abrir en el navegador</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>Salir de la sesión</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>Cambios Recientes</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>Carpetas Administradas:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>Abrir carpeta &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>Abrir %1 en el navegador</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>Estado desconocido</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>Ayuda</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>Salir %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation>Desconectado de %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation>Versión del Servidor No Soportada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>El servidor de la cuenta %1 está corriendo una versión antigua y no soportada %2. El uso de este cliente con una versión del servidor no soportada no ha sido probado y es potencialmente peligroso. Procede bajo tu propio riesgo.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation>Desconectado de algunas cuentas</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>Desconectado de las cunetas:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>Cuenta %1 : %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>Sesión cerrada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>La sincronización de cuentas está deshabilitada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>La sincronización está pausada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>Error durante la sincronización</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation>No se han configurado carpetas de sincronización</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>Pausar las carpetas</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>Pausar toda la sincronización</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>Pausar sincronización</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation>Falla ahora</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>No se han sincronizado elementos recientemente</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation>Sincronizando %1 de %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>Sincronizando %1 (faltan %2)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>Sincronizando %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>Actualizado</translation>
</message>
@@ -3991,7 +3838,7 @@ No es recomendable usarlo. </translation>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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 f1db36b93..7ff7db564 100644
--- a/translations/client_es_SV.ts
+++ b/translations/client_es_SV.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>Espacio de almacenamiento: ...</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
@@ -242,230 +242,199 @@
<translation>Conectado con &lt;server&gt; como &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>No hay cuentas configuradas.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>Agregar nuevo</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>Eliminar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>Cuenta</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>Elige que sincronizar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>Forzar la sincronización ahora</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>Reiniciar sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>Eliminar la conexión de sincronización de carpetas</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>Falló la creación de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Confirmar la Eliminación de la Conexión de Sincronización de Carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>Eliminar la Conexión de Sincronización de la Carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>Sincronización en curso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>La operación de sincronización está en curso. &lt;br/&gt;¿Deseas terminarla?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 como &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>¡La versión del servidor %1 es antigua y no está soportada! Procede bajo tu propio riesgo. </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>Conectado a %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>El servidor %1 se encuntra temporalmente no disponible</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Actualmente el servidor %1 se encuentra en modo mantenimiento.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>Cerraste sesión en %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Obteniendo autorización del navegador. &lt;a href=&apos;%1&apos;&gt;Haz click aquí&lt;/a&gt; para re-abrir el navegador.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>No hay conexión a %1 en %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>Iniciar sesión</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Hay carpetas que no fueron sincronizadas porque son de almacenamiento externo:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Confirma la Remosion de la Cuenta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<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;¿Realmente quieres eliminar la conexión a la cuenta &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Esto &lt;b&gt;no&lt;/b&gt; borrará ningún archivo.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>Eliminar conexión</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>Abrir carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>Salir</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>Reanudar sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>Pausar sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;¿Realmente quieres dejar de sincronizar la carpeta &lt;i&gt;%1&lt;/i&gt;?&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Esto &lt;b&gt;no&lt;/b&gt; borrará ningún archivo.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) de %2 en uso. Algunas carpetas, incluidas carpetas montadas en red o carpetas compartidas, pueden tener diferentes límites</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>%1 de %2 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualmente no hay información disponible del espacio usado.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>No hay %1 conexión configurada. </translation>
</message>
@@ -473,104 +442,63 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>Sesión cerrada</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>Servicio no disponible</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>Modo Mantenimiento</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>Error de red</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>Error de configuración</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>Solicitando Credenciales</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>Estado de la cuenta no conocido</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation type="unfinished"/>
- </message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br/&gt;La cuenta %1 no tiene las actividades habilitadas.</translation>
- </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
@@ -680,12 +608,12 @@
<translation>No se ha configurado alguna cuenta de ownCloud</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>El servidor configurado para este cliente es demasiado antiguo</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Por favor actualiza a la versión más reciente del servidor y reinicia el cliente.</translation>
</message>
@@ -901,36 +829,36 @@
<translation>No fue posible leer el archivo de exclusión del sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Una nueva carpeta de más de %1 MB ha sido agregada: %2
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>Una carpeta de un almacenamiento externo ha sido agregada.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Por favor ve a las configuraciones para seleccionarlo si deseas descargarlo. </translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -939,7 +867,7 @@ This means that the synchronization client might not upload local changes immedi
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -947,29 +875,29 @@ If you decide to delete the files, they will be unavailable to you, unless you a
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -979,17 +907,17 @@ Continuar con la sincronización como normal causará que todos tus archivos sea
¿Quieres mantener tu copia local más reciente como archivos en conflicto?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>Respaldo detectado</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>Sincronización Normal</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>Mantener los Archivos Locales como Conflictos</translation>
</message>
@@ -1476,22 +1404,22 @@ Continuar con la sincronización como normal causará que todos tus archivos sea
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2623,7 +2551,7 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>Descartar</translation>
</message>
@@ -2636,22 +2564,17 @@ No es recomendable usarlo. </translation>
<translation>Configuraciones</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>Actividad</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>General</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>Red</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>Cuenta</translation>
</message>
@@ -2897,60 +2820,54 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation>Te compartí algo</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation>Copiar la liga privada al portapapeles</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation type="unfinished"/>
</message>
@@ -3437,7 +3354,7 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3445,17 +3362,68 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3492,234 +3460,113 @@ No es recomendable usarlo. </translation>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>Por favor inicia sesión</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>Carpeta %1 : %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>No se han configurado carpetas para sincronizar</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>Abrir en el navegador</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>Salir de la sesión</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>Cambios Recientes</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>Carpetas Administradas:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>Abrir carpeta &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>Abrir %1 en el navegador</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>Estado desconocido</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>Ayuda</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>Salir %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation>Desconectado de %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation>Versión del Servidor No Soportada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>El servidor de la cuenta %1 está corriendo una versión antigua y no soportada %2. El uso de este cliente con una versión del servidor no soportada no ha sido probado y es potencialmente peligroso. Procede bajo tu propio riesgo.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation>Desconectado de algunas cuentas</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>Desconectado de las cunetas:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>Cuenta %1 : %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>Sesión cerrada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>La sincronización de cuentas está deshabilitada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>La sincronización está pausada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>Error durante la sincronización</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation>No se han configurado carpetas de sincronización</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>Pausar las carpetas</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>Pausar toda la sincronización</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>Pausar sincronización</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation>Falla ahora</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>No se han sincronizado elementos recientemente</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation>Sincronizando %1 de %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>Sincronizando %1 (faltan %2)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>Sincronizando %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>Actualizado</translation>
</message>
@@ -3991,7 +3838,7 @@ No es recomendable usarlo. </translation>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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 e520d4855..b1c7dd0b5 100644
--- a/translations/client_et.ts
+++ b/translations/client_et.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>Salvestusruum: ...</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>Loobu</translation>
</message>
@@ -242,230 +242,199 @@
<translation>Ühendatud &lt;server&gt; kasutajana &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>Ühtegi kontot pole seadistatud</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>Lisa uus</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>Eemalda</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>Konto</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>Vali, mida sünkroniseerida</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>Kausta loomine ebaõnnestus</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>Sünkroniseerimine on käimas</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Sünkroniseerimine on käimas.&lt;br/&gt;Kas sa soovid seda lõpetada?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 kasutusel</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 as &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>Ühendatud %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Server %1 pole ajutiselt saadaval.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>Logi sisse</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Kinnita konto eemaldamine</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>Eemalda ühendus</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>Ava kaust</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>Logi välja</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>Taasta sünroonimist</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>Peata sünkroonimine</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>Hetkel pole mahu kasutuse info saadaval.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>Ühtegi %1 ühendust pole seadistatud.</translation>
</message>
@@ -473,102 +442,61 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>Välja logitud</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>Lahti ühendatud</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>Ühendatud</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>Teenus pole saadaval</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>Võrgu viga</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>Seadistamise tõrge</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>Tundmatu konto olek</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation type="unfinished"/>
- </message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
</context>
@@ -680,12 +608,12 @@
<translation>Ühtegi ownCloud kontot pole seadistatud</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>Seadistatud server on selle kliendi jaoks liiga vana</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Palun uuenda server viimasele versioonile ning taaskäivita klient.</translation>
</message>
@@ -901,34 +829,34 @@
<translation>Süsteemi väljajätmiste faili lugemine ebaõnnestus</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -937,7 +865,7 @@ This means that the synchronization client might not upload local changes immedi
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -945,46 +873,46 @@ If you decide to delete the files, they will be unavailable to you, unless you a
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>Leiti varukoopia</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>Tavaline sünkroonimine</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@@ -1471,22 +1399,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2617,7 +2545,7 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>Jäta vahele</translation>
</message>
@@ -2630,22 +2558,17 @@ Selle kasutamine pole soovitatav.</translation>
<translation>Seaded</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>Toimingud</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>Üldine</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>Võrk</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>Konto</translation>
</message>
@@ -2891,60 +2814,54 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation type="unfinished"/>
</message>
@@ -3431,7 +3348,7 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3439,17 +3356,68 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3486,234 +3454,113 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>Palun logi sisse</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>Kaust %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>Sünkroniseeritavaid kaustasid pole määratud.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>Ava veebilehitsejas</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>Logi välja</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>Hiljutised muudatused</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>Hallatavad kaustad:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>Ava kaust &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>Ava %1 veebilehitsejas</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>Tundmatu staatus</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>Abiinfo</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>Lõpeta %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>Lahti ühendatud</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>Kontodest lahtiühendatud</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>Konto %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>Välja logitud</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation>Jookse kokku</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>Ühtegi üksust pole hiljuti sünkroniseeritud</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>Sünkroniseerin %1 (%2 veel)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>Sünkroniseerimine %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>Ajakohane</translation>
</message>
@@ -3985,7 +3832,7 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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 3d424bcfd..ba2c5ba2a 100644
--- a/translations/client_eu.ts
+++ b/translations/client_eu.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>Biltegiratze ahalmena: ...</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>Ezeztatu</translation>
</message>
@@ -242,230 +242,199 @@
<translation>&lt;user&gt; bezala &lt;server&gt;-n konektatuta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>Ez da konturik konfiguratu.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>Gehitu berria</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>Ezabatu</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>Kontua</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation>Kontu honek onartzen du muturretik muturrerako zifratzea</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation>Gaitu zifratzea</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation>Erakutsi E2E mnemoteknikoa</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation>Zifratu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation>Editatu baztertutako fitxategiak</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>Hautatu zer sinkronizatu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>Behartu orain sinkronizatzen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>Berrabiarazi sinkronizazioa</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>Ezabatu karpeta honen konexioa</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>Karpeta sortzeak huts egin du</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Baieztatu Karpetaren Konexioaren Ezabatzea</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>Ezabatu Karpeta Honen Konexioa</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>Sinkronizazioa martxan da</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Sinkronizazio martxan da.&lt;br/&gt;Bukatu nahi al duzu?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 erabiltzen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>Zerbitzariaren bertsioa %1 zaharra eta euskarririk gabekoa da! Zure ardurapean aritu.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>%1ra konektatuta.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>%1 zerbitzaria ez dago orain eskuragarri</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>%1 zerbitzaria une honetan mantenu lanetan dago.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>%1etik saioa itxita.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Nabigatzailearen baimena eskuratzen. Egin &lt;a href= &apos;%1&apos;&gt;klik hemen&lt;/a&gt; nabigatzailea berrabiarazteko.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>Konexiorik ez %1-ekin %2-etan</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>Hasi saioa</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Hainbat karpeta ez dira sinkronizatu handiegiak direlako:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Hainbat karpeta ez dira sinkronizatu kanpoko biltegietan daudelako:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Hainbat karpeta ez dira sinkronizatu handiegiak direlako edo kanpoko biltegietan daudelako:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Baieztatu Kontuaren Ezabatzea</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<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;kontuaren 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/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>Ezabatu konexioa</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>Ireki karpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>Saioa bukatu</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>Berrekin sinkronizazioa</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>Gelditu sinkronizazioa</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Ziur zaude &lt;i&gt;%1&lt;/i&gt;karpetaren sinkronizazioa gelditu 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/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%2-tik %1 (%3%) erabiltzen ari da. Zenbait karpetek, sarean muntatutako edo partekatutako karpetak barne, muga desberdinak izan ditzakete.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>%2tik %1 erabilita</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>Orain ez dago eskuragarri biltegiratze erabileraren informazioa.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>Ez dago %1 konexiorik konfiguratuta.</translation>
</message>
@@ -473,103 +442,62 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>Saioa bukatuta</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>Deskonektatuta</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>Konektatuta</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>Zerbitzua ez dago eskuragarri</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>Mantenu lanetan</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>Sare errorea</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>Konfigurazio errorea</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>Kredentzialak eskatzen</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>Kontuaren egoera ezezaguna</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation>Informazio gehiago</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation>Onartu</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation>Batu</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation>Ireki nabigatzailea</translation>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation>Onartu</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
- <translation>Sinkronizatuta</translation>
- </message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation>Saiatu berriro denak kargatzen</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br/&gt;%1 kontuak ez ditu jarduerak gaituta.</translation>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -680,12 +608,12 @@
<translation>Ez dago ownCloud konturik konfiguratuta</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>Bezero honentzako konfiguratutako zerbitzaria oso zaharra da</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Mesedez eguneratu zerbitzarira eta berrabiarazi bezeroa.</translation>
</message>
@@ -901,36 +829,36 @@
<translation>Ezin izan da sistemako baztertutakoen fitxategia irakurri</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>%1 MB baino handiagoa den karpeta berri bat gehitu da: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>Kanpoko biltegi bateko karpeta gehitu da.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Jo ezarpenetara aukeratzeko deskargatu nahi ote duzun.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>%1 karpeta sortu zen baina sinkronizaziotik kanpo ezarri zen. Haren barneko fitxategiak ez dira sinkronizatuko.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>%1 fitxategia sortu zen baina sinkronizaziotik kanpo ezarri zen. Fitxategia ez da sinkronizatuko.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -943,7 +871,7 @@ Honek esan nahi du sinkronizazio bezeroak agian ez duela berehalakoan kargatuko
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -951,29 +879,29 @@ If you decide to delete the files, they will be unavailable to you, unless you a
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation>Ezabatu fitxategi guztiak?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation>Ezabatu fitxategi guztiak</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation>Berreskuratu ezabatutako fitxategiak</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -983,17 +911,17 @@ Sinkronizazio honekin segitzen baduzu litekeena da aurreko egoerako fitxategiek
Nahi al duzu zure tokiko fitxategi berrienak gatazkako fitxategi gisa mantentzea?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>Babeskopia detektatu da</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>Sinkronizazio normala</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>Mantendu fitxategi lokalak gatazka gisa</translation>
</message>
@@ -1480,22 +1408,22 @@ Nahi al duzu zure tokiko fitxategi berrienak gatazkako fitxategi gisa mantentzea
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation>Errorea partekatzerakoan</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2630,7 +2558,7 @@ Ez da gomendagarria erabltzea.</translation>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
@@ -2643,22 +2571,17 @@ Ez da gomendagarria erabltzea.</translation>
<translation>Ezarpenak</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>Jarduera</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>Orokorra</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>Sarea</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>Kontua</translation>
</message>
@@ -2904,60 +2827,54 @@ Ez da gomendagarria erabltzea.</translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation>%1(r)ekin partekatu</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation>Zerbait partekatu dut zurekin</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation>Partekatze aukerak</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation>Kopiatu esteka pribatua arbelera</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation>Fitxategi hau birpartekatzea ez da onartzen</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation>Kopiatu esteka publikoa</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation>Kopiatu barne esteka</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation>Ireki nabigatzailean</translation>
</message>
@@ -3442,7 +3359,7 @@ Ez da gomendagarria erabltzea.</translation>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3450,17 +3367,68 @@ Ez da gomendagarria erabltzea.</translation>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3497,234 +3465,113 @@ Ez da gomendagarria erabltzea.</translation>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>Mesedez saioa hasi</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>%1 karpeta: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>Ez dago sinkronizazio karpetarik definituta.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>Ireki nabigatzailean</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>Saioa bukatu</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>Azkenengo Aldaketak</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>Kudeatutako karpetak:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>Ireki &apos;%1&apos; karpeta</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>Ireki %1 arakatzailean</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>Egoera ezezaguna</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>Laguntza</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>%1etik Irten</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation>%1etik deskonektatuta</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>Deskonektatuta</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>Kontuetatik deskonektatuta:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>%1 Kontua: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>Saioa bukatuta</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>Kontuen sinkronizazioa desaktibatua dago</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>Sinkronizazioa pausatua dago</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation>Ebatzi gabeko gatazkak</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>Errorea sinkronizatzean</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation>Ez dira ezarri sinkronizatzeko karpetak</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>Karpeta guztiak eten</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation>Berrabiarazi sinkronizazio guztiak</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation>Berrabiarazi sinkronizazioa</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>Pausatu sinkronizazio guztiak</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>Pausatu sinkronizazioa</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation>Kraskatu orain</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation>Aplikazioak</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>Ez da azken aldian ezer sinkronizatu</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation>Sinlrnozatzen %1 %2tik</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>Sinkronizatzen %1 (%2faltan)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>%1 Sinkronizatzen</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>Eguneratua</translation>
</message>
@@ -3996,7 +3843,7 @@ Ez da gomendagarria erabltzea.</translation>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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_fa.ts b/translations/client_fa.ts
index c6c88b8a8..cac7f123d 100644
--- a/translations/client_fa.ts
+++ b/translations/client_fa.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>حجم فضای ذخیره‌سازی: ...</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>منصرف شدن</translation>
</message>
@@ -242,230 +242,199 @@
<translation>متصل به &lt;server&gt; به عنوان &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>هیچ حساب‌کاربری‌ای تنظیم نشده‌ است.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>اضافه کردن جدید</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>حذف</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>حساب کاربری</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation>این حساب کاربری امکان رمزنگاری انتها-به-انتها را دارد</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation>فعال سازی رمزنگاری</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation>رمزنگاری</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>انتخاب موارد همگام‌سازی</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>راه اندازی مجدد همگام سازی</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>حذف اتصال همگام سازی پوشه </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>ساخت پوشه ناموفق</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>تأیید حذف اتصال همگام سازی پوشه</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>حذف اتصال همگام سازی پوشه</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>همگام سازی در حال اجراست</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>عملیات همگام سازی در حال اجراست.&lt;br/&gt;آیا دوست دارید آن را متوقف کنید؟</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>1% در استفاده</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>1% به عنوان &lt;i&gt;2%&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>نسخه سرور 1% قدیمی است و پشتیبانی نشده است! مسئولیت با خود شماست.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>متصل به %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>سرور %1 بصورت موقت خارج از دسترس است.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>سرور 1% اکنون در حالت تعمیر است.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>از 1% خارج شد.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>دریافت مجوز از مرورگر. &lt;a href=&apos;%1&apos;&gt;اینجا کلیک کنید&lt;/a&gt; تا مرورگر دوباره باز شود.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>اتصال به 1% در 2% وجود ندارد.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>ورود</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>پوشه‌هایی وجود دارند که همگام سازی نشده اند زیرا آن ها بسیار بزرگ هستند:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>پوشه‌هایی وجود دارند که همگام سازی نشده اند زیرا آن ها مخازن خارجی هستند:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>پوشه‌هایی وجود دارند که همگام سازی نشده اند زیرا آن ها بسیار بزرگ یا مخازن خارجی هستند:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>تائید حذف حساب‌کاربری</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;آیا شما واقعا می خواهید اتصال به حساب &lt;i&gt;1%&lt;/i&gt;را حذف کنید؟&lt;/p&gt; &lt;p&gt;&lt;b&gt;توجه:&lt;/b&gt; این هیچ فایلی را حذف نخواهد کرد.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>حذف ارتباط</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>بازکردن پوشه</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>خروج</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>از سر‎گیری همگام‌سازی</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>توقف به‌هنگام‌سازی </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;آیا شما واقعا می خواهید همگام سازی پوشه &lt;i&gt;1%&lt;/i&gt; را متوقف نمایید؟&lt;/p&gt;&lt;p&gt;&lt;b&gt;توجه:&lt;/b&gt;این هیچ فایلی را حذف &lt;b&gt;نخواهد&lt;/b&gt; کرد. &lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>1% (%3%) از 2% در استفاده. برخی پوشه‌ها، شامل شبکه نصب شده یا پوشه های مشترک، ممکن است محدودیت های متفاوت داشته باشند.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>1% از 2% در استفاده</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>در حال حاضر هیچ اطلاعات کاربرد ذخیره سازی در دسترس نیست.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>بدون %1 اتصال پیکربندی شده.</translation>
</message>
@@ -473,103 +442,62 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>خارج شد</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>قطع شده</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>متصل</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>سرویس خارج از دسترس</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>حالت تعمیر</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>خطای شبکه</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>خطای پیکربندی</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>درخواست مجوزها</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>وضعیت حساب ناشناخته</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation>اطلاعات بیشتر</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation>موافق</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation>ملحق شدن</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation>مرورگر را باز کنید</translation>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation>تایید</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
- <translation>همگام سازی شد</translation>
- </message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation>تلاش مجدد برای بارگذاری همه</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br/&gt;فعالیت های حساب 1% فعال نیست.</translation>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -680,12 +608,12 @@
<translation>هیچ حساب ownCloud پیکربندی نشده است</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>پیکربندی سرور برای این مشتری بسیار قدیمی است.</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>لطفا به آخرین سرور به روز رسانی کنید و مشتری را مجددا راه اندازی نمایید.</translation>
</message>
@@ -901,36 +829,36 @@
<translation>نمی توان پرونده خارجی سیستم را خواند.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>یک پوشه جدید بزرگتر از 1% MB اضافه شده است: 2%.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>یک پوشه از یک مخزن خارجی اضافه شده است.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>اگر می خواهید این را دانلود کنید لطفا به تنظیمات بروید تا آن را انتخاب کنید.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -939,7 +867,7 @@ This means that the synchronization client might not upload local changes immedi
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -947,29 +875,29 @@ If you decide to delete the files, they will be unavailable to you, unless you a
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -978,17 +906,17 @@ Continuing the sync as normal will cause all your files to be overwritten by an
ادامه همگام سازی به طور معمول سبب خواهد شد که تمام پرونده های شما توسط یک فایل قدیمی تر در یک وضعیت جدیدتر بازنویسی شوند. آیا شما می خواهید پرونده های اخیر محلیتان را به عنوان پرونده های ناسازگار نگهداری کنید؟</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>پشتیبان شناسایی شد</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>همگام سازی معمول</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>پرونده های محلی را به عنوان ناسازگار نگه دارید</translation>
</message>
@@ -1475,22 +1403,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation>خطای به اشتراک گذاری</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2621,7 +2549,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>پنهان کن</translation>
</message>
@@ -2634,22 +2562,17 @@ It is not advisable to use it.</source>
<translation>تنظیمات</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>فعالیت</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>عمومی</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>شبکه</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>حساب کاربری</translation>
</message>
@@ -2895,60 +2818,54 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation>من چیزی را با شما به اشتراک گذاشتم</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation>لینک خصوصی را در کلیپ بورد کپی کنید</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation>بازکردن در مرورگر</translation>
</message>
@@ -3434,7 +3351,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3442,17 +3359,68 @@ It is not advisable to use it.</source>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3489,234 +3457,113 @@ It is not advisable to use it.</source>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>لطفا وارد شوید</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>پوشه %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>هیچ پوشه‌ای برای همگام‌سازی تنظیم نشده است.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>باز کردن در مرورگر</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>خروج</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>تغییرات اخیر</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>پوشه های مدیریت شده:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>بازکردن پوشه‌ی &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>1% را در مرورگر باز کنید</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>وضعیت نامعلوم</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>راه‌نما</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>خروج %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation>قطع‌شده از %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation>نسخه سرور پشتیبانی نشده </translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>سرور روی حساب 1% یک نسخه قدیمی و پشتیبانی نشده 2% را اجرا کرده است. استفاده از این مشتری با نسخه های سرور پشتیبانی نشده بررسی نشده و خطرناک است. مسئولیت با خود شماست.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>قطع شده</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation>قطع شده از برخی حساب ها</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>قطع شده از حساب ها:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>حساب‌کاربری %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>خارج شد</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>همگام سازی حساب غیر فعال است</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>همگام سازی متوقف شده است</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>خطا حین همگام سازی</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation>هیچ پوشه‌ همگام سازی پیکربندی شده</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation>از سرگیری همه پوشه ها</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>توقف تمام پوشه‌ها</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>توقف تمام همگام سازی ها</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>توقف همگام سازی</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation>برنامه ها</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>هیچ موردی به تازگی همگام‌سازی نشده است</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation>همگام سازی 1% از 2%</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>همگام‌سازی %1 (%2 باقیمانده)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>همگام‌سازی %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>تا تاریخ</translation>
</message>
@@ -3988,7 +3835,7 @@ It is not advisable to use it.</source>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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 447dd835b..c907ca2b3 100644
--- a/translations/client_fi.ts
+++ b/translations/client_fi.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>Tallennustila: ...</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>Peruuta</translation>
</message>
@@ -242,230 +242,199 @@
<translation>Yhdistetty palvelimeen &lt;server&gt; käyttäen tunnusta &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>Tiliä ei ole määritelty.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>Lisää uusi</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>Poista</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>Tili</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation>Tämä tili tukee päästä päähän -salausta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation>Ota salaus käyttöön</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation>Salaus</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>Valitse synkronoitavat tiedot</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>Pakota synkronointi nyt</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>Käynnistä synkronointi uudelleen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>Poista kansion synkronointiyhteys</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>Kansion luominen epäonnistui</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Vahvista kansion synkronointiyhteyden poisto</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>Poista kansion synkronointiyhteys</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>Synkronointi meneillään</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Synkronointioperaatio on meneillään.&lt;br/&gt;Haluatko keskeyttää sen?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 käytössä</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 käyttäjänä &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>Palvelimen versio %1 on vanha ja sen tuki on loppunut! Jatka omalla vastuulla.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>Yhteys muodostettu kohteeseen %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Palvelin %1 ei ole juuri nyt saatavilla.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Palvelin %1 on parhaillaan huoltotilassa.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>Kirjauduttu ulos kohteesta %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Hankitaan valtuutus selaimelta. &lt;a href=&apos;%1&apos;&gt;Napsauta tästä&lt;/a&gt; avataksesi selaimen uudelleen.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>Ei yhteyttä kohteeseen %1 osoitteessa %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>Kirjaudu sisään</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Havaittiin kansioita, joita ei synkronoitu, koska ne ovat kooltaan liian suuria:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Vahvista tilin poistaminen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Haluatko varmasti poistaa tilin &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Huomio:&lt;/b&gt; Tämä toimenpide &lt;b&gt;ei&lt;/b&gt; poista mitään tiedostoja.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>Poista yhteys</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>Avaa kansio</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>Kirjaudu ulos</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>Palauta synkronointi</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>Keskeytä synkronointi</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Haluatko varmasti lopettaa kansion &lt;i&gt;%1&lt;/i&gt; synkronoinnin?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Huomio:&lt;/b&gt; Tämä toimenpide &lt;b&gt;ei&lt;/b&gt; poista mitään tiedostoja.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1/%2 (%3 %) käytössä. Jotkin kansiot, mukaan lukien verkkojaot ja jaetut kansiot, voivat sisältää eri rajoitukset.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>%1/%2 käytössä</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>Tallennustilan käyttötietoja ei ole juuri nyt saatavilla.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>%1-yhteyttä ei ole määritelty.</translation>
</message>
@@ -473,104 +442,63 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>Kirjauduttu ulos</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>Yhteys katkaistu</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>Yhdistetty</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>Palvelu ei ole käytettävissä</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>Huoltotila</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>Verkkovirhe</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>Asetusvirhe</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>Kysytään tilitietoja</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>Tuntematon tilin tila</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation>Lisätietoja</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation>Hyväksy</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation>Liity</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation>Avaa selain</translation>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation>Hyväksy</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
- <translation>Synkronoitu</translation>
- </message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br/&gt;Tilillä %1 ei ole toimia käytössä.</translation>
- </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
@@ -680,12 +608,12 @@
<translation>ownCloud-tiliä ei ole määritelty</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>Määritelty palvelin on ohjelmistoversioltaan liian vanha tälle asiakasohjelmistolle</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Päivitä uusimpaan palvelinversioon ja käynnistä asiakasohjelmisto uudelleen.</translation>
</message>
@@ -901,36 +829,36 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Uusi kansio kooltaan yli %1 Mt on lisätty: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>Kansio erillisestä tallennustilasta on lisätty.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -939,7 +867,7 @@ This means that the synchronization client might not upload local changes immedi
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -947,46 +875,46 @@ If you decide to delete the files, they will be unavailable to you, unless you a
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation>Poistetaanko kaikki tiedostot?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation>Poista kaikki tiedostot</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation>Palauta poistetut tiedostot</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>Varmuuskopio poistettu</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>Normaali synkronointi</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@@ -1473,22 +1401,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation>Jakamisvirhe</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2619,7 +2547,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>Hylkää</translation>
</message>
@@ -2632,22 +2560,17 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<translation>Asetukset</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>Toimet</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>Yleiset</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>Verkko</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>Tili</translation>
</message>
@@ -2893,60 +2816,54 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation>Jaoin jotain kanssasi</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation>Kopioi yksityinen linkki leikepöydälle</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<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.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation>Kopioi julkinen linkki</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation>Kopioi sisäinen linkki</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation>Avaa selaimessa</translation>
</message>
@@ -3433,7 +3350,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3441,17 +3358,68 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3488,234 +3456,113 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>Kirjaudu sisään</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>Kansio %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>Synkronointikansioita ei ole määritelty.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>Avaa selaimessa</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>Kirjaudu ulos</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>Viimeisimmät muutokset</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>Hallitut kansiot:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>Avaa kansio &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>Avaa %1 selaimeen</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>Tuntematon tila</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>Ohje</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>Lopeta %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation>Katkaise yhteys kohteeseen %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation>Palvelimen versio ei ole tuettu</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>Yhteys katkaistu</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation>Yhteys katkaistu joihinkin tileihin</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>Katkaistu yhteys tileihin:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>Tili %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>Kirjauduttu ulos</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>Tilin synkronointi on poistettu käytöstä</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>Synkronointi on keskeytetty</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>Virhe kesken synkronoinnin</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>Keskeytä kaikki kansiot</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>Keskeytä kaikki synkronointi</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>Keskeytä synkronointi</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation>Sovellukset</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>Kohteita ei ole synkronoitu äskettäin</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation>Synkronoidaan %1/%2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>Synkronoidaan %1 (%2 jäljellä)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>Synkronoidaan %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>Ajan tasalla</translation>
</message>
@@ -3987,7 +3834,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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 0b821a388..f78610506 100644
--- a/translations/client_fr.ts
+++ b/translations/client_fr.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>Espace de stockage : ...</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>Annuler</translation>
</message>
@@ -242,230 +242,199 @@
<translation>Connecté au serveur &lt;server&gt; avec le compte &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>Aucun compte configuré.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>Ajouter un nouveau compte</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>Supprimer</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>Compte</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation>Ce compte prend en charge le chiffrement de bout en bout.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation>Activer le chiffrement</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation>Afficher le code mnémotechnique E2E</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation>Chiffrer</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation>Modifier les fichiers ignorés</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>Sélectionner le contenu à synchroniser</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>Forcer la synchronisation maintenant</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>Redémarrer la synchronisation</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>Supprimer la synchronisation du dossier</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>Échec de création du dossier</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Confirmer la suppression de synchronisation de dossier</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>Supprimer la synchronisation de ce dossier</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>Synchronisation en cours</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>La synchronisation est en cours.&lt;br/&gt;Voulez-vous l&apos;arrêter ?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 utilisé(s)</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 avec le compte &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>La version %1 du serveur est ancienne et n&apos;est pas prise en charge. Continuez à vos risques et périls.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>Connecté au serveur %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Le serveur %1 est temporairement indisponible.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Le serveur %1 est en cours de maintenance.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>Session sur %1 fermée.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>En attente d&apos;autorisation du navigateur. &lt;a href=&apos;%1&apos;&gt;Cliquer ici&lt;/a&gt; pour recharger le navigateur.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>Aucune connexion au serveur %1 à l&apos;adresse %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>Se connecter</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Certains dossiers n&apos;ont pas été synchronisés parce qu&apos;ils sont de taille trop importante :</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Certains dossiers n&apos;ont pas été synchronisés parce qu&apos;ils sont localisés sur un stockage externe :</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Certains dossiers n&apos;ont pas été synchronisés par qu&apos;ils sont localisés sur un stockage externe ou qu&apos;ils sont de taille trop importante :</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Confirmation de retrait du compte</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Êtes-vous certain de vouloir retirer &lt;i&gt;%1&lt;/i&gt; des comptes synchronisés avec le serveur ?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Remarque :&lt;/b&gt; cela ne supprimera pas votre compte sur le serveur et aucun fichier ne sera supprimé ni localement ni en ligne.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>Retirer le compte</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>Ouvrir le dossier local</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>Se déconnecter</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>Reprendre la synchronisation</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>Mettre en pause</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;Impossible de créer le dossier local &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Voulez-vous vraiment arrêter de synchroniser le dossier &lt;i&gt;%1&lt;/i&gt; ?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note :&lt;/b&gt; Aucun fichier ne sera supprimé.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) utilisés sur %2. Certains dossiers, montés depuis le réseau ou partagés, peuvent avoir des limites différentes.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>%1 utilisés sur %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actuellement aucune information d&apos;utilisation de stockage n&apos;est disponible.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation>Connexion à %1 ...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>Aucune connexion à %1 configurée</translation>
</message>
@@ -473,103 +442,62 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>Session fermée</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>Déconnecté</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>Connecté</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>Service indisponible</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>mode maintenance</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>Erreur réseau</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>Erreur de configuration</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>informations d&apos;identification demandées</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>Etat du compte inconnu</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation>Plus d&apos;informations</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation>Accepter</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation>Rejoindre</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation>Ouvrir le navigateur</translation>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation>Les fichiers présents dans la liste d&apos;exclusion ainsi que les liens symboliques ne sont pas synchronisés. Cela inclut :</translation>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation>Accepter</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
- <translation>Synchronisé</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation>Relancer tous les envois</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br/&gt;Le compte %1 n&apos;a aucune activité activée.</translation>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -680,12 +608,12 @@
<translation>Aucun compte ownCloud configuré</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>Le serveur configuré pour ce client est trop vieux</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Veuillez mettre à jour le serveur vers la dernière version et redémarrer le client.</translation>
</message>
@@ -901,14 +829,14 @@
<translation>Impossible de lire le fichier d&apos;exclusion du système</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Un nouveau dossier de taille supérieure à %1 Mo a été ajouté : %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>Un nouveau dossier localisé sur un stockage externe a été ajouté.
@@ -916,22 +844,22 @@
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Merci d&apos;aller dans les Paramètres pour indiquer si vous souhaitez le télécharger.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Le dossier %1 a été créé mais il était exclu de la synchronisation auparavant. Les données qu&apos;il contient ne seront pas synchronisées.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Le fichier %1 a été créé mais il était exclu de la synchronisation auparavant. Il ne sera pas synchronisé.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -945,7 +873,7 @@ Cela signifie que le client de synchronisation peut ne pas télécharger immédi
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -956,7 +884,7 @@ Si vous décidez de restaurer ces fichiers, ils seront renvoyés vers le serveur
Si vous décidez de supprimer ces fichiers, ils seront définitivement indisponibles.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
@@ -965,22 +893,22 @@ Par conséquent tous ces fichiers vont être supprimés sur le serveur ainsi que
Si ces suppressions étaient involontaires, il est encore temps de restaurer vos fichiers.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation>Supprimer tous les fichiers ?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation>Supprimer tous les fichiers</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation>Restaurer les fichiers supprimés</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -989,17 +917,17 @@ Cela peut être dû à une copie de sauvegarde restaurée sur le serveur.
Continuer la synchronisation comme d&apos;habitude fera en sorte que tous les fichiers soient remplacés par des fichiers plus vieux d&apos;un état précédent. Voulez-vous conserver les versions les plus récentes de vos fichiers en tant que fichiers conflictuels ?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>Sauvegarde détectée</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>Synchronisation normale</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>Conserver les fichiers locaux comme Conflits</translation>
</message>
@@ -1486,22 +1414,22 @@ Continuer la synchronisation comme d&apos;habitude fera en sorte que tous les fi
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation>Mot de passe requis</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<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/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation>Erreur de partage</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2639,7 +2567,7 @@ Il est déconseillé de l&apos;utiliser.</translation>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>Ignorer</translation>
</message>
@@ -2652,22 +2580,17 @@ Il est déconseillé de l&apos;utiliser.</translation>
<translation>Paramètres</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>Activité</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>Paramètres</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>Réseau</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>Compte</translation>
</message>
@@ -2914,60 +2837,54 @@ Il est déconseillé de l&apos;utiliser.</translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation>Partager avec %1</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation>Partage du menu contextuel</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation>J&apos;ai partagé quelque chose avec vous</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation>Options de partage</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation>Partager via %1</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation>Envoyer le lien privé par courriel ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation>Copier le lien privé dans le presse-papier</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation>Repartager ce fichier n&apos;est pas autorisé</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation>Copier le lien public</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation>Copier le lien interne</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation>Ouvrir dans le navigateur</translation>
</message>
@@ -3454,7 +3371,7 @@ Il est déconseillé de l&apos;utiliser.</translation>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1 : %2</translation>
</message>
@@ -3462,17 +3379,68 @@ Il est déconseillé de l&apos;utiliser.</translation>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>Cette version est fournie par %1.</translation>
</message>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3509,234 +3477,113 @@ Il est déconseillé de l&apos;utiliser.</translation>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>Veuillez vous connecter</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>Dossier %1 : %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>Aucun dossier à synchroniser n&apos;est configuré</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>Ouvrir dans le navigateur web</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>Se déconnecter</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>Modifications récentes</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>Dossiers configurés</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>Ouvrir le dossier local &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>Ouvrir %1 dans le navigateur</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>Statut inconnu</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>Aide...</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>Quitter %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation>Déconnecté de %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation>Version du Serveur non prise en charge</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>Le serveur sur le compte %1 fonctionne avec une version ancienne et non-supportée %2. Utiliser ce client avec des versions non-supportées du serveur n&apos;est pas testé et est potentiellement dangereux. Procédez à vos risques et périls.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>Déconnecté</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation>Déconnecté de certains comptes</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>Déconnecté des comptes :</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>Compte %1 : %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>Session fermée</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>La synchronisation est en pause</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>La synchronisation est en pause</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation>Conflits non résolus</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>Erreur durant la synchronisation</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation>Aucun dossier de synchronisation configuré</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation>Reprendre tous les dossiers</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>Mettre en pause tous les dossiers</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation>Connexion …</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation>Reprendre toutes les synchronisations</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation>Reprendre la synchronisation</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>Mettre en pause toutes les synchronisations</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>Mettre en pause la synchronisation </translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Synchronisation de %1 sur %2 (%3 restants)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation>Plantage maintenant</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation>Apps</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation>Paramétrages …</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation>Nouveau compte…</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation>Afficher plus d&apos;activité…</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>Aucun élément synchronisé récemment</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation>Vérification des modifications dans &apos;%1&apos; distant</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation>Vérification des modifications dans &apos;%1&apos; local</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation>Synchronisation %1 sur %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>Synchronisation de %1 (%2 restants)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>Synchronisation de %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>À jour</translation>
</message>
@@ -4008,7 +3855,7 @@ Il est déconseillé de l&apos;utiliser.</translation>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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 02a69544c..89cc26566 100644
--- a/translations/client_gl.ts
+++ b/translations/client_gl.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>Espazo de almacenamento: ...</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
@@ -242,230 +242,199 @@
<translation>Conectado con &lt;server&gt; como &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>Non hai contas configuradas.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>Engadir novo</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>Retirar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>Conta</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation>Esta conta admite o cifrado de extremo a extremo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation>Activar o cifrado</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation>Amosar o mnemónico E2E</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation>Cifrar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation>Editar ficheiros ignorados</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>Escolla que sincronizar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>Forzar a sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>Reiniciar a sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>Retirar a conexión da sincronización do cartafol</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>Non foi posíbel crear o cartafol</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Confirmar a retirada da conexión da sincronización do cartafol</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>Retirar a conexión da sincronización do cartafol</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>Sincronización en proceso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Estase a realizar a sincronización.&lt;br/&gt;Quere interrompela e rematala?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 como &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>Este servidor da versión %1 é vello e non ten soporte! Vostede verá o que fai.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>Conectado a %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>O servidor %1 non está dispoñíbel temporalmente.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>O servidor %1 neste momento está en modo de mantemento.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>Desconectado de %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Obtendo autorización dende o navegador. &lt;a href=&apos;%1&apos;&gt;Prema aquí&lt;/a&gt; para volver abrir o navegador.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>Non hai conexión con %1 en %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>Acceder</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Hai cartafoles que non se sincronizaron por ser demasiado grandes:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Hai cartafoles que non se sincronizaron porque son almacenamentos externos:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Hai cartafoles que non se sincronizaron porque son demasiado grandes ou almacenamentos externos:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Confirme a retirada da conta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;De verdade quere retirar a conexión a conta &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Aviso:&lt;/b&gt; Isto &lt;b&gt;non&lt;/b&gt; eliminará ningún ficheiro.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>Retirar conexión</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>Abrir o cartafol</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>Saír</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>Continuar coa sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>Por en pausa a sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;Non foi posíbel crear o cartafol local &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Quere realmente deixar de sincronizar o cartafol &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Aviso:&lt;/b&gt; Isto &lt;b&gt;non&lt;/b&gt; eliminará ningún ficheiro.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) de %2 en uso. Algúns cartafoles, incluíndo os compartidos e os montados en rede, poderían ter diferentes límites.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>%1 de %2 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualmente non hai dispoñíbel ningunha información sobre o uso do almacenamento.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation>Conectando con %1…</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>Non se configurou a conexión %1.</translation>
</message>
@@ -473,103 +442,62 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>Servizo non dispoñíbel</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>Modo de mantemento</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>Produciuse un erro de rede</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>Produciuse un erro de configuración</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>Solicitando credenciais</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>Estado da conta descoñecido</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation>Máis información</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation>Aceptar</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation>Unirse</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation>Abrir o navegador</translation>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation>Non se sincronizaran os ficheiros da lista de ignorados e as ligazóns simbólicas. Isto inclúe:</translation>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation>Aceptar</translation>
- </message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
- <translation>Sincronizado</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation>Tentar de novo todos os envíos</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br/&gt;A conta %1 non ten activadas as actividades.</translation>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -680,12 +608,12 @@
<translation>Non hai configurada ningunha conta ownCloud </translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>O servidor configurado para este cliente é moi antigo</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Actualice ao último servidor e reinicie o cliente.</translation>
</message>
@@ -901,36 +829,36 @@
<translation>Non foi posíbel ler o ficheiro de exclusión do sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Foi engadido un cartafol maior de %1 MB: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>Foi engadido un cartafol de almacenamento externo.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Vaia a axustes a seleccionalo se quere descargar isto.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Creouse o cartafol %1 mais foi excluído da sincronización con anterioridade. Os datos no seu interior non se sincronizarán.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Creouse o ficheiro %1 mais foi excluído da sincronización con anterioridade. Non se sincronizará.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -943,7 +871,7 @@ Isto significa que o cliente de sincronización podería non enviar os cambios i
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -954,7 +882,7 @@ Se decide restaurar os ficheiros, resincronizaranse co servidor se ten dereitos
Se decide eliminar os ficheiros, non poderá dispor deles a non ser que sexa o propietario.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
@@ -963,22 +891,22 @@ Estes ficheiros eliminaranse do servidor e non estarán dispoñibles nos outros
Se esta acción non foi intencionada, pode restaurar os datos perdidos agora.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation>Eliminar todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation>Eliminar todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation>Restaurar os ficheiros eliminados</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -987,17 +915,17 @@ Isto podería ser porque se restaurou unha copia de seguridade no servidor.
Continuando a sincronización como normal fará que todos os seus ficheiros sexan substituídos por unha versión anterior. Quere manter os seus ficheiros máis recentes locais como ficheiros en conflito?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>Detectouse unha copia de seguridade</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>Sincronización normal</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>Mantener os ficheiros locais en caso de conflito</translation>
</message>
@@ -1484,22 +1412,22 @@ Continuando a sincronización como normal fará que todos os seus ficheiros sexa
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation>Requírese un contrasinal para compartir</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<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/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation>Produciuse un erro ao compartir</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2637,7 +2565,7 @@ Recomendámoslle que non o use.</translation>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>Rexeitar</translation>
</message>
@@ -2650,22 +2578,17 @@ Recomendámoslle que non o use.</translation>
<translation>Axustes</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>Actividade</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>Xeral</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>Rede</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>Conta</translation>
</message>
@@ -2911,60 +2834,54 @@ Recomendámoslle que non o use.</translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation>Compartir con %1</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation>Compartir o menú contextual</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation>Compartín algo con vostede</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation>Opcións da compartición</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation>Compartido mediante %1</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation>Enviar a ligazón privada por correo…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation>Copiar a ligazón privada no portapapeis</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation>Non está permitido volver compartir este ficheiro</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation>Copiar a ligazón pública</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation>Copiar a ligazón interna</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation>Abrir no navegador</translation>
</message>
@@ -3451,7 +3368,7 @@ Recomendámoslle que non o use.</translation>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3459,17 +3376,68 @@ Recomendámoslle que non o use.</translation>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<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>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3506,234 +3474,113 @@ Recomendámoslle que non o use.</translation>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>Ten que rexistrarse</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>Cartafol %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>Non existen cartafoles de sincronización configurados.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>Abrir no navegador</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>Saír</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>Cambios recentes</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>Cartafoles xestionados:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>Abrir o cartafol «%1»</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>Abrir %1 nun navegador</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>Estado descoñecido</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>Axuda</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>Saír de %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation>Desconectado de %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation>Versión del servidor non admitida</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>O servidor na conta %1 usa unha versión antiga e xa non admitida (%2). O uso deste cliente con versións de servidor non admitidas non está probado e é potencialmente perigoso. Proceda baixo a súa propia responsabilidade.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation>Desconectado dalgunhas contas</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>Desconectado das contas:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>Conta %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>A sincronización está desactivada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>A sincronización está en pausa</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation>Conflitos sen resolver</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>Produciuse un erro durante a sincronización</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation>Non hai cartafoles de sincronización configurados</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation>Continuar todos os cartafoles</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>Pausar todos os cartafoles</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation>Acceder…</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation>Continuar con todas as sincronizacións</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation>Continuar coa sincronización</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>Pausar todas as sincronizacións</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>Pausar a sincronización</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Sincronizando %1 de %2 (restan %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation>Quebrou agora</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation>Aplicacións</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation>Axustes…</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation>Nova conta…</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation>Ver máis actividade…</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>Non hai elementos sincronizados recentemente</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation>Comprobando os cambios no cartafol remoto «%1»</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation>Comprobando os cambios no cartafol local «%1»</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation>Sincronizando %1 de %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>Sincronizando %1 (restan %2)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>Sincronizando %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>Actualizado</translation>
</message>
@@ -4005,7 +3852,7 @@ Recomendámoslle que non o use.</translation>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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 562ba9f91..6892357cc 100644
--- a/translations/client_he.ts
+++ b/translations/client_he.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>מקום אחסון: …</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>ביטול</translation>
</message>
@@ -242,230 +242,199 @@
<translation>מחובר באמצעות &lt;server&gt; כ &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>לא הוגדר חשבון.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>הוספת חדש</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>הסרה</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>חשבון</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation>הראה תיבת זיכרון ל הצפנה מקצה לקצה </translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation>הצפן</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>לבחור מה לסנכרן</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>לאלץ סנכרון כעת</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>להפעיל את הסנכרון מחדש</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>הסרת חיבור סנכרון לתיקייה</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>יצירת התיקייה נכשלה</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>אשר הסרת חיבור ל סנכרון תיקיות</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>הסר חיבור ל סנכרון תיקיות</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>סנכרון מופעל</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>הסנכרון מופעל.&lt;br/&gt;האם להפסיק את פעולתו ?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 בשימוש</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 בתור &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>גרסת השרת %1 ישנה ואינה נתמכת! המשך עבודה בגרסה זו תחת אחריותך.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>בוצע חיבור אל %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>השרת %1 אינו זמין כרגע.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>השרת %1 כרגע במצב תחזוקה.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>יצאת מהשירות %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>מתבצעת בקשת אימות מהדפדפן. נא &lt;a href=&apos;%1&apos;&gt;ללחוץ כאן&lt;/a&gt; לפתיחה מחדש של הדפדפן.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>אין חיבור אל %1 ב־%2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>כניסה</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>ישנן תיקיות שלא סונכרנו מפאת גודלן הרב:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>ישנן תיקיות שלא סונכרנו כיוון שהן נמצאות על אמצעי אחסון חיצוניים:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>ישנן תיקיות שלא סונכרנו כיוון שהן גדולות מדי או באחסון חיצוני:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>אישור הסרת חשבון</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;האם ברצונך להסיר את החיבור לחשבון &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;שים לב:&lt;/b&gt;פעולה זו &lt;b&gt;לא&lt;/b&gt; תסיר את הקבצים.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>הסרת חיבור</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>פתיחת תיקייה</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>יציאה</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>להמשיך בסנכרון</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>השהיית סנכרון</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;האם ברצונך להפסיק את סנכרון התיקיה &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;שים לב:&lt;/b&gt; פעולה זו &lt;b&gt;לא &lt;/b&gt; תמחק את הקבצים.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) מתוך %2 בשימוש. חלק מהתיקיות, ובכללן תיקיות רשת או משותפות, עלולות להיות בעלות מכסות שונות.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>%1 מתוך %2 בשימוש</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>ברגע זה אין כל מידע זמין על השימוש באחסון.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>אין הגדרה לחיבור %1</translation>
</message>
@@ -473,103 +442,62 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>לא מחובר לחשבון</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>מנותק </translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>מחובר</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>השירות אינו זמין</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>מצב תחזוקה</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>שגיאת רשת</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>שגיאת הגדרות</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>מבקש אישור</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>מצב חשבון לא ידוע</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation>מידע נוסף</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation>אשר</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation>הצטרף</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation>פתח דפדפן</translation>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation>אשר</translation>
- </message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
- <translation>סונכרן</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation>נסה מחדש את כל ההעלאות</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>חשבון %1 לא איפשר את מצב הפעילויות.</translation>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -680,12 +608,12 @@
<translation>אין חשבון ownCloud בנמצא</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>השרת המוגדר ללקוח זה מיושן מדי</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>נא לעדכן לגרסה החדשה ביותר של השרת ולהפעיל מחדש את הלקוח.</translation>
</message>
@@ -901,36 +829,36 @@
<translation>לא ניתן לקרוא את קובץ ההחרגה של המערכת.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>נוספה תיקייה שגודלה הוא מעבר ל־%1 מ״ב: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>נוספה תיקייה ממקור חיצוני.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>נא לגשת להגדרות כדי לבחור אם ברצונך להוריד אותה.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>התיקייה %1 נוצרה אך הוחרגה מהסנכרון בעבר. הנתונים שבתוכה לא יסונכרנו.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -939,7 +867,7 @@ This means that the synchronization client might not upload local changes immedi
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -947,46 +875,46 @@ If you decide to delete the files, they will be unavailable to you, unless you a
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>התגלה גיבוי</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>סנכרון רגיל</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>להשאיר את הקבצים המקומיים כסותרים</translation>
</message>
@@ -1473,22 +1401,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation>שגיאת שיתוף</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2618,7 +2546,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>התעלמות</translation>
</message>
@@ -2631,22 +2559,17 @@ It is not advisable to use it.</source>
<translation>הגדרות</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>פעילות</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>כללי</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>רשת</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>חשבון</translation>
</message>
@@ -2892,60 +2815,54 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation>שיתוף עם %1</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation>שיתוף מתפריט הקשר</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation>שיתפתי אתך משהו</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation>העתקת שיעור פרטי ללוח הגזירים</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation>אסור לשתף קובץ זה מחדש</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation>פתיחה בדפדפן</translation>
</message>
@@ -3430,7 +3347,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
@@ -3438,17 +3355,68 @@ It is not advisable to use it.</source>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3485,234 +3453,113 @@ It is not advisable to use it.</source>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>נא להיכנס</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>תיקייה %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>לא מוגדרות תיקיות לסנכרון</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>פתיחה בדפדפן</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>יציאה</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>שינויים אחרונים</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>תיקיות מנוהלות:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>פתיחת התיקייה ‚%1’</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>פתיחת %1 בדפדפן</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>מצב לא ידוע</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>עזרה</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>יציאה מ־%1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation>ניתוק מ־%1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation>גרסת השרת אינה נתמכת</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>חשבון %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>יצאת</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>סנכרון החשבון מושבת</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>הסנכרון מושהה</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation>סתירות בלתי פתורות</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>שגיאה במהלך הסנכרון</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation>לא הוגדרו תיקיות סנכרון</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation>להמשיך עם כל התיקיות</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>להשהות את כל התיקיות</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation>להמשיך את כל הסנכרונים</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation>להמשיך סנכרון</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>להשהות את כל הסנכרונים</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>להשהות סנכרון</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>עדכני</translation>
</message>
@@ -3984,7 +3831,7 @@ It is not advisable to use it.</source>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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 70f1b2cb8..813daa14b 100644
--- a/translations/client_hr.ts
+++ b/translations/client_hr.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>Prostor za pohranu:...</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>Odustani</translation>
</message>
@@ -242,230 +242,199 @@
<translation>Povezan s &lt;poslužitelj&gt; kao &lt;korisnik&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>Račun nije konfiguriran.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>Dodaj novi</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>Ukloni</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>Račun</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation>Ovaj račun podržava cjelovito šifriranje</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation>Omogući šifriranje</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation>Pokaži E2E mnemoničku oznaku</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation>Šifriraj</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation>Uredi zanemarene datoteke</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>Odaberite što sinkronizirati</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>Sinkroniziraj sada</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>Ponovno pokreni sinkronizaciju</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>Uklonite poveznicu za sinkronizaciju mape</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>Neuspješna izrada mape</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Potvrdi uklanjanje poveznice za sinkronizaciju mape</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>Uklonite poveznicu za sinkronizaciju mape</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>Sinkronizacija u tijeku</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Sinkronizacija je pokrenuta.&lt;br/&gt;Želite li je prekinuti?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 u upotrebi</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 kao &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>Inačica poslužitelja %1 je stara i nepodržana! Nastavite na vlastitu odgovornost.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>Povezano s %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Poslužitelj %1 privremeno nije dostupan.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Poslužitelj %1 trenutno je u načinu održavanja.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>Odjavili ste se iz %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Dobivanje autorizacije od preglednika. &lt;a href=&apos;%1&apos;&gt;Kliknite ovdje&lt;/a&gt; za ponovno otvaranje preglednika.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>Ne postoji veza s %1 na %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>Prijava</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Ove mape nisu sinkronizirane jer su prevelike:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Ove mape nisu sinkronizirane jer su vanjski prostori za pohranu: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Ove mape nisu sinkronizirane jer su prevelike ili su vanjski prostori za pohranu: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Potvrdi brisanje računa</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<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/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>Ukloni vezu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>Otvori mapu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>Odjava</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>Nastavi sinkronizaciju</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>Pauziraj sinkronizaciju</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;Nije moguće stvoriti lokalnu mapu &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Želite li zaista prekinuti sinkronizaciju mape &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/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) od %2 u upotrebi. Neke mape, uključujući mrežne ili dijeljene mape, mogu imati različita ograničenja.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>%1 od %2 u upotrebi</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>Trenutno nema dostupnih podataka o uporabi pohrane.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation>Povezivanje s %1…</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>Nije konfigurirana veza %1.</translation>
</message>
@@ -473,103 +442,62 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>Odjavljen</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>Odspojen</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>Povezan</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>Usluga nedostupna</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>Način održavanja</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>Pogreška mreže</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>Pogreška konfiguracije</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>Traženje vjerodajnica</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>Nepoznato stanje računa</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation>Više informacija</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation>Prihvati</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation>Pridruži se</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation>Otvori preglednik</translation>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation>Ne sinkroniziraju se datoteke s popisa za zanemarivanje, kao ni simboličke poveznice. Navedeno uključuje:</translation>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation>Prihvati</translation>
- </message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
- <translation>Sinkronizirano</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation>Ponovno pokreni sve otpreme</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br/&gt;Račun %1 nema omogućenih aktivnosti.</translation>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -680,12 +608,12 @@
<translation>Nije konfiguriran račun za ownCloud</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>Konfigurirani poslužitelj za ovog klijenta je prestar</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Ažurirajte na najnoviji poslužitelj i ponovno pokrenite klijenta.</translation>
</message>
@@ -901,36 +829,36 @@
<translation>Nije moguće pročitati datoteku izuzetka iz sustava</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Dodana je nova mapa veća od %1 MB: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>Dodana je mapa iz vanjskog prostora za pohranu.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Idite u postavke kako biste je odabrali ako je želite preuzeti.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Mapa %1 je stvorena, ali je prethodno isključena iz sinkronizacije. Podaci unutar nje neće se sinkronizirati.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Datoteka %1 je stvorena, ali je prethodno isključena iz sinkronizacije. Neće se sinkronizirati.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -943,7 +871,7 @@ To znači da klijent za sinkronizaciju možda neće odmah otpremiti lokalne prom
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -954,7 +882,7 @@ Ako odlučite vratiti datoteke, ponovno će se sinkronizirati s poslužiteljem a
Ako odlučite izbrisati datoteke, one će vam biti nedostupne ako niste njihov vlasnik.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
@@ -963,22 +891,22 @@ Te će datoteke biti izbrisane s poslužitelja i neće biti dostupne na drugim u
Ako navedena radnja nije bila namjerna, možete odmah vratiti izgubljene podatke.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation>Izbrisati sve datoteke?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation>Izbrisati sve datoteke?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation>Vrati izbrisane datoteke</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -987,17 +915,17 @@ To može biti zbog vraćanja sigurnosne kopije na poslužitelj.
Nastavljanje sinkronizacije uzrokovat će zamjenu svih vaših datoteka starijim inačicama istih datoteka. Želite li zadržati najnovije lokalne datoteke kao datoteke nepodudaranja?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>Otkrivena je sigurnosna kopija</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>Normalna sinkronizacija</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>Zadrži lokalne datoteke kao datoteke nepodudaranja</translation>
</message>
@@ -1484,22 +1412,22 @@ Nastavljanje sinkronizacije uzrokovat će zamjenu svih vaših datoteka starijim
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation>Potrebna je zaporka za dijeljenje</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<source>Please enter a password for your link share:</source>
<translation>Unesite zaporku svoje poveznice dijeljenja:</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation>Pogreška dijeljenja</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2637,7 +2565,7 @@ Nije preporučljivo koristiti ga.</translation>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>Zanemari</translation>
</message>
@@ -2650,22 +2578,17 @@ Nije preporučljivo koristiti ga.</translation>
<translation>Postavke</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>Aktivnost</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>Općenito</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>Mreža</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>Račun</translation>
</message>
@@ -2911,60 +2834,54 @@ Nije preporučljivo koristiti ga.</translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation>Dijeli s %1</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation>Dijeljenje kontekstnog izbornika</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation>Dijelim nešto s vama</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation>Mogućnosti dijeljenja</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation>Dijeli putem %1</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation>Pošalji privatnu poveznicu e-poštom…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation>Kopiraj privatnu poveznicu u međuspremnik</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation>Dijeljenje ove datoteke nije dopušteno</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation>Kopiraj javnu poveznicu</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation>Kopiraj internu poveznicu</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation>Otvori u pregledniku</translation>
</message>
@@ -3451,7 +3368,7 @@ Nije preporučljivo koristiti ga.</translation>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3459,17 +3376,68 @@ Nije preporučljivo koristiti ga.</translation>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<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>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3506,234 +3474,113 @@ Nije preporučljivo koristiti ga.</translation>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>Prijavite se</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>Mapa %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>Nema konfiguriranih mapa za sinkronizaciju.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>Otvori u pregledniku</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>Odjava</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>Nedavne promjene</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>Upravljane mape:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>Otvori mapu &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>Otvori %1 u pregledniku</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>Nepoznati status</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>Pomoć</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>Zatvori %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation>Odspojen od %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation>Nepodržana inačica poslužitelja</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>Poslužitelj na računu %1 koristi se starom i nepodržanom inačicom %2. Upotreba ovog klijenta s nepodržanim inačicama poslužitelja nije testirana i potencijalno je opasna. Nastavite na vlastitu odgovornost.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>Odspojen</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation>Odspojen od nekih računa</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>Odspojen od računa:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>Račun %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>Odjavljen</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>Sinkronizacija računa je onemogućena</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>Sinkronizacija je pauzirana</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation>Neriješena nepodudaranja</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>Pogreška tijekom sinkronizacije</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation>Nije konfigurirana nijedna mapa za sinkronizaciju</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation>Nastavi sve mape</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>Pauziraj sve mape</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation>Prijava…</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation>Nastavi sve sinkronizacije</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation>Nastavi sinkronizaciju</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>Zaustavi sve sinkronizacije</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>Pauziraj sinkronizaciju</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Sinkronizacija %1 od %2 (preostalo %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation>Sruši se</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation>Aplikacije</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation>Postavke…</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation>Novi račun…</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation>Prikaži više aktivnosti…</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>Nije sinkronizirana nijedna stavka nedavno</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation>Provjera za promjene u udaljenom ‘%1’</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation>Provjera za promjene u lokalnom ‘%1’</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation>Sinkronizacija %1 od %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>Sinkronizacija %1 (preostalo %2)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>Sinkronizacija %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>Ažurno</translation>
</message>
@@ -4005,7 +3852,7 @@ Nije preporučljivo koristiti ga.</translation>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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 6cb109443..98bd9dd0b 100644
--- a/translations/client_hu.ts
+++ b/translations/client_hu.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>Tárhely mérete: …</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>Mégse</translation>
</message>
@@ -242,230 +242,199 @@
<translation>Kapcsolódva &lt;user&gt; felhasználóval ehhez: &lt;server&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>Nincs fiók beállítva.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>Új hozzáadása</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>Eltávolítás</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>Fiók</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation>Ez a fiók támogatja a végpontok közötti titkosítást</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation>Titkosítás engedélyezése</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation>E2E mnemonikus kód megjelenítése</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation>Titkosítás</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation>Kihagyott fájlok szerkesztése</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>Szinkronizálandó elemek kiválasztása</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>Szinkronizálás azonnal</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>Szinkronizálás újraindítása</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>Mappa szinkronizálási kapcsolatának eltávolítása</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>Mappa létrehozása sikertelen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Mappa szinkronizációs kapcsolatának eltávolításának megerősítése</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>Mappa szinkronizálási kapcsolatának eltávolítása</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>A szinkronizálás fut</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>A szinkronizálás folyamatban van. &lt;br/&gt;Megszakítja?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 használatban</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1, mint &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>A(z) %1 kiszolgálóverzió régi és már nem támogatott! Csak saját felelősségre folytassa.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>Kapcsolódva ehhez: %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>A(z) %1 kiszolgáló jelenleg nem érhető el.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>A(z) %1 kiszolgáló jelenleg karbantartási módban van.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>Kijelentkezve innen: %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Engedély kérése a böngészőtől. &lt;a href=&apos;%1&apos;&gt;Kattintson ide&lt;/a&gt; a böngésző újranyitásához.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>Nincs kapcsolat ehhez: %1, itt: %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>Bejelentkezés</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Az alábbi mappák nem lettek szinkronizálva, mert túl nagyok:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Az alábbi mappák nem lettek szinkronizálva, mert külső tárolók:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Az alábbi mappák nem lettek szinkronizálva, mert túl nagyok, vagy külső tárolók:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Fiók törlésének megerősítése</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Tényleg törölni szeretné 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/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>Kapcsolat eltávolítása</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>Mappa megnyitása</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>Kilépés</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>Szinkronizálás folytatása</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>Szinkronizálás szüneteltetése</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Tényleg leállítja a(z) &lt;i&gt;%1&lt;/i&gt; mappa szinkronizálását?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Megjegyzés:&lt;/b&gt; Ez &lt;b&gt;nem&lt;/b&gt; töröl fájlokat.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) / %2 használatban. Néhány mappa – beleértve a hálózati megosztásokat és a megosztott könyvtárakat – eltérő korlátozással rendelkezhet.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>%1 / %2 használatban</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>Jelenleg nem érhetőek el a tárhelyhasználati információk.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>Nincs %1 kapcsolat beállítva.</translation>
</message>
@@ -473,103 +442,62 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>Kijelentkezve</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>Kapcsolat bontva</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>Kapcsolódva</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>A szolgáltatás nem érhető el</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>Karbantartási üzemmód</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>Hálózati hiba</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>Beállítási hiba</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>Hitelesítési adatok kérése</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>Ismeretlen fiókállapot</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation>További információk</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation>Elfogadás</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation>Csatlakozás</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation>Böngésző megnyitása</translation>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation>Elfogadás</translation>
- </message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
- <translation>Szinkronizálva</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation>Összes feltöltés újrapróbálása</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br/&gt;A(z) %1 fióknál nincsenek tevékenységek engedélyezve.</translation>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -680,12 +608,12 @@
<translation>Nincs ownCloud fiók beállítva</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>A beállított kiszolgáló túl régi ehhez a klienshez</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Frissítse a kiszolgálót a legfrissebb verzióra, és indítsa újra a klienst.</translation>
</message>
@@ -901,36 +829,36 @@
<translation>Nem lehetett beolvasni a rendszer kizárási fájlját</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Egy %1 MB méretet meghaladó mappa lett hozzáadva: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>Egy külső tárolóból származó mappa lett hozzáadva.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>A beállításoknál válassza ki, ha le szeretné tölteni.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>A(z) %1 mappa létre lett hozva, de előzőleg ki lett hagyva a szinkronizálásból. A benne lévő adatok nem lesznek szinkronizálva.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>A(z) %1 fájl létre lett hozva, de előzőleg ki lett hagyva a szinkronizálásból. Nem lesz szinkronizálva.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -943,7 +871,7 @@ Ez azt jelenti, hogy a szinkronizációs kliens lehet, hogy nem fogja azonnal fe
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -951,29 +879,29 @@ If you decide to delete the files, they will be unavailable to you, unless you a
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation>Törli az összes fájlt?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation>Összes fájl törlése</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation>Törölt fájlok visszaállítása</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -982,17 +910,17 @@ Ez lehet, hogy azért van, mert egy biztonsági mentést állíthattak vissza a
A szinkronizálás folytatásával az összes fájlja felül lesz írva egy régebbi állapottal. Megtartja ütközési fájlként a legfrissebb helyi fájlokat?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>Biztonsági mentés észlelve</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>Normál szinkronizálás</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>Helyi fájlok megtartása ütközésként</translation>
</message>
@@ -1479,22 +1407,22 @@ A szinkronizálás folytatásával az összes fájlja felül lesz írva egy rég
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation>Megosztási hiba</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2631,7 +2559,7 @@ Használata nem ajánlott.</translation>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>Elutasítás</translation>
</message>
@@ -2644,22 +2572,17 @@ Használata nem ajánlott.</translation>
<translation>Beállítások</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>Tevékenység</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>Általános</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>Hálózat</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>Fiók</translation>
</message>
@@ -2905,60 +2828,54 @@ Használata nem ajánlott.</translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation>Megosztás vele: %1</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation>Megosztás a helyi menüből</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation>Megosztottam Önnel valamit</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation>Megosztási beállítások</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<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.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<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.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation>Nyilvános hivatkozás másolása</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation>Belső hivatkozás másolása</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation>Megnyitás böngészőben</translation>
</message>
@@ -3445,7 +3362,7 @@ Használata nem ajánlott.</translation>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3453,17 +3370,68 @@ Használata nem ajánlott.</translation>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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 verzió. 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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<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>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3500,234 +3468,113 @@ Használata nem ajánlott.</translation>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>Jelentkezzen be</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>%1 mappa: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>Nincsenek szinkronizálandó mappák beállítva.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>Megnyitás böngészőben</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>Kijelentkezés</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>Legutóbbi változások</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>Kezelt mappák:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>A(z) „%1” mappa megnyitása</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>A(z) %1 megnyitása böngészőben</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>Ismeretlen állapot</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>Súgó</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>Kilépés a %1ból</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation>Kapcsolat bontva a %1dal</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation>Nem támogatott kiszolgálóverzió</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>A(z) %1 fiók kiszolgálója egy régi és nem támogatott verziót (%2) használ. A kliens nem támogatott kiszolgálóverzióval történő használata nincs tesztelve, és veszélyes is lehet. A saját felelősségére folytassa.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>Kapcsolat bontva</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation>Kapcsolat bontva néhány fióknál</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>Kapcsolat bontva a fiókokkal:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>%1 fiók: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>Kijelentkezve</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>Fiók szinkronizálás letiltva</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>Szinkronizálás szüneteltetve</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation>Nem feloldott ütközések</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>Hiba a szinkronizáláskor</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation>Nincs szinkronizációs könyvtár beállítva</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation>Összes mappa folytatása</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>Összes mappa szüneteltetése</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation>Összes szinkronizálás folytatása</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation>Szinkronizálás folytatása</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>Összes szinkronizálás szüneteltetése</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>Szinkronizálás szüneteltetése</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation>Összeomlás most</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation>Alkalmazások</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>Mostanában nem volt szinkronizált elem</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation>Változások keresése a(z) „%1” távoli mappában</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation>Változások keresése a(z) „%1” helyi mappában</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation>%1 / %2 szinkronizálása</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>%1 szinkronizálása (%2 maradt)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>%1 szinkronizálása</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>Naprakész</translation>
</message>
@@ -3999,7 +3846,7 @@ Használata nem ajánlott.</translation>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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 de454100f..0a0b1db34 100644
--- a/translations/client_id.ts
+++ b/translations/client_id.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>Ruang penyimpanan: ...</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>Batal</translation>
</message>
@@ -242,230 +242,199 @@
<translation>Terhubung dengan &lt;server&gt; sebagai &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>Belum ada akun terkonfigurasi</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>Tambahkan baru</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>Buang</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>Akun</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation>Akun ini mendukung enkripsi end-to-end</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation>Hidupkan enkripsi</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation>Tampilkan E2E mnemonic</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation>Enkrip</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>Pilih apa yang akan disinkron</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>Paksa sinkronisasi sekarang</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>Ulang sinkronisasi</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>Hapus koneksi sinkronisasi folder</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>Pembuatan Folder gagal</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Konfirmasi Penghapusan Koneksi Sinkronisasi Folder</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>Hapus Koneksi Sinkronisasi Folder</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>Sinkronisasi berlangsung</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Operasi sinkronisasi sedang berjalan. &lt;br/&gt;Apakah Anda ingin membatalkannya?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 digunakan</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 sebagai &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>Versi server %1 sudah usang dan tidak lagi di dukung! Resiko tanggung sendiri.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>Tersambung ke %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Peladen %1 sementara tidak tersedia.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Peladen %1 sementara dalam moda pemeliharaan.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>Log keluar dari %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Mendapatkan autorisasi dari browser. &lt;a href=&apos;%1&apos;&gt;Klik disini&lt;/a&gt; untuk membuka ulang browser.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>Tidak ada koneksi ke %1 di %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>Log masuk</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Terdapat folder tidak tersinkronisasi karena terlalu besar:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Terdapat folder tidak tersinkronisasi karena penyimpanan eksternal:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Terdapat folder tidak tersinkronisasi karena terlalu besar atau penyimpanan ekternal:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Konfirmasi pemutusan akun</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<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; Apakah Anda ingin menghapus koneksi untuk akun &lt;i&gt; %1&lt;/i&gt;?&lt;/p&gt; &lt;p&gt;&lt;b&gt; Catatan: &lt;/b&gt; Aksi ini tidak akan menghapus berkas apapun.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>Hapus koneksi</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>Buka folder</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>Log keluar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>Lanjutkan sinkron</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>Jeda sinkron</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt; Apakah Anda ingin menghentikan sinkronisasi folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt; Catatan:&lt;/b&gt; Aksi ini tidak akan menghapus berkas apapun.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) dari %2 sedang digunakan. Beberapa folder, termasuk jaringan yang terpasang atau folder yang telah dibagikan, kemungkinan mempunyai beberapa keterbatasan.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>%1 dari %2 sedang digunakan</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>Saat ini tidak ada informasi penggunaan ruang yang tersedia.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>Tidak ada koneksi %1 yang dikonfigurasi.</translation>
</message>
@@ -473,103 +442,62 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>Log keluar</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>Terputus</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>Tersambung</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>Layanan tidak tersedia</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>Mode perbaikan</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>Kesalahan jaringan</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>Kesalahan konfigurasi</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>Menanyakan Kredensial</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>Kondisi akun tidak diketahui</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation>Informasi lebih lanjut</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation>Terima</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation>Gabung</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation>Buka Peramban</translation>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation>Terima</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
- <translation>Tersinkronisasi</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation>Mencoba semua unggahan</translation>
- </message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br/&gt;Akun %1 tidak memiliki aktivitas yang diaktifkan.</translation>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -680,12 +608,12 @@
<translation>Belum ada akun ownCloud yang dikonfigurasi</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>Server yang telah dikonfigurasi untuk klien ini sudah terlalu usang</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Mohon untuk memperbaharui ke server yang terbaru kemudian restart klien.</translation>
</message>
@@ -901,36 +829,36 @@
<translation>Tidak dapat membaca berkas sistem yang dikecualikan</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Sebuah folder baru lebih dari %1 MB telah ditambahkan: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>Sebuah folder dari luar ruang penyimpanan telah ditambahkan.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Mohon untuk ke pengaturan untuk memilihnya jika Anda ingin mengunduhnya.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Folder %1 telah dibuat namun dikecualikan dari sinkronisasi sebelumnya. Data yang ada di dalamnya tidak akan disinkronisasi.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Berkas %1 telah dibuat namun dikecualikan dari sinkronisasi sebelumnya. Data yang ada di dalamnya tidak akan disinkronisasi.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -943,7 +871,7 @@ Ini artinya sinkronisasi klien mungkin tidak menggunggah perubahan lokal seseger
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -951,29 +879,29 @@ If you decide to delete the files, they will be unavailable to you, unless you a
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -982,17 +910,17 @@ Ini disebabkan karena sebuah cadangan telah dipulihkan di server.
Melanjutkan sinkronisasi seperti biasanya akan menyebabkan semua berkas Anda ditimpa dengan berkas yang lama di kondisi yang lama. Apakah Anda ingin tetap membuat berkas lokal paling baru Anda sebagai berkas yang berkonflik?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>Cadangan ditemukan</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>Sinkronisasi Normal</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>Buat Berkas Lokal sebagai Konflik</translation>
</message>
@@ -1479,22 +1407,22 @@ Melanjutkan sinkronisasi seperti biasanya akan menyebabkan semua berkas Anda dit
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation>Gagal berbagi</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2629,7 +2557,7 @@ Tidak disarankan untuk digunakan.</translation>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
@@ -2642,22 +2570,17 @@ Tidak disarankan untuk digunakan.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation type="unfinished"/>
</message>
@@ -2903,60 +2826,54 @@ Tidak disarankan untuk digunakan.</translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation type="unfinished"/>
</message>
@@ -3441,7 +3358,7 @@ Tidak disarankan untuk digunakan.</translation>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
@@ -3449,281 +3366,211 @@ Tidak disarankan untuk digunakan.</translation>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>OCC::WebEnginePage</name>
+ <name>OCC::User</name>
<message>
- <location filename="../src/gui/wizard/webview.cpp" line="208"/>
- <source>Invalid certificate detected</source>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/webview.cpp" line="209"/>
- <source>The host &quot;%1&quot; provided an invalid certificate. Continue?</source>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::WebFlowCredentials</name>
<message>
- <location filename="../src/gui/creds/webflowcredentials.cpp" line="169"/>
- <source>You have been logged out of %1 as user %2. Please login again</source>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/webflowcredentials.cpp" line="189"/>
- <source>Please login with the user: %1</source>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::WebFlowCredentialsDialog</name>
<message>
- <location filename="../src/gui/creds/webflowcredentialsdialog.cpp" line="34"/>
- <source>Log in</source>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>OCC::ownCloudGui</name>
+ <name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
- <source>Please sign in</source>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
- <source>Folder %1: %2</source>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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/owncloudgui.cpp" line="357"/>
- <source>There are no sync folders configured.</source>
+ <location filename="../src/gui/tray/UserModel.cpp" line="688"/>
+ <source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
<translation type="unfinished"/>
</message>
+</context>
+<context>
+ <name>OCC::WebEnginePage</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
+ <location filename="../src/gui/wizard/webview.cpp" line="208"/>
+ <source>Invalid certificate detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
+ <location filename="../src/gui/wizard/webview.cpp" line="209"/>
+ <source>The host &quot;%1&quot; provided an invalid certificate. Continue?</source>
<translation type="unfinished"/>
</message>
+</context>
+<context>
+ <name>OCC::WebFlowCredentials</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
+ <location filename="../src/gui/creds/webflowcredentials.cpp" line="169"/>
+ <source>You have been logged out of %1 as user %2. Please login again</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
+ <location filename="../src/gui/creds/webflowcredentials.cpp" line="189"/>
+ <source>Please login with the user: %1</source>
<translation type="unfinished"/>
</message>
+</context>
+<context>
+ <name>OCC::WebFlowCredentialsDialog</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
+ <location filename="../src/gui/creds/webflowcredentialsdialog.cpp" line="34"/>
+ <source>Log in</source>
<translation type="unfinished"/>
</message>
+</context>
+<context>
+ <name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
+ <source>Please sign in</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
+ <source>Folder %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
+ <source>There are no sync folders configured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation type="unfinished"/>
</message>
@@ -3995,7 +3842,7 @@ Tidak disarankan untuk digunakan.</translation>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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 32e6ff8c9..09666194a 100644
--- a/translations/client_is.ts
+++ b/translations/client_is.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>Geymslurými: ...</translation>
</message>
@@ -232,8 +232,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>Hætta við</translation>
</message>
@@ -243,235 +243,204 @@
<translation>Tengd/ur við &lt;server&gt; sem &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>Enginn aðgangur stilltur.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>Bæta við nýju</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>Fjarlægja</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>Aðgangur</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation>Virkja dulritun</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation>Sýna E2E minnistækni</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation>Dulrita</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>Veldu það sem á að samstilla</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>Þvinga samstillingu núna</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>Endurræsa samstillingu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>Fjarlægja samstillingartengingu möppu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>Gerð möppu mistókst</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Staðfesta fjarlægingu á samstillingartengingu möppu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>Fjarlægja samstillingartengingu möppu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>Samstilling er keyrandi</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Aðgerðin sem samstillir er í gangi.&lt;br/&gt;Viltu stöðva hana?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 í notkun</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 sem &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>Þjónninn er af útgáfu %1 sem er úrelt og ekki lengur studd! Ef þú heldur
áfram er það á þína eigin ábyrgð.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>Tengdur við %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Þjónninn %1 er ekki tiltækur í augnablikinu.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Þjónninn %1 er í viðhaldsham.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>Skráður út af %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>Engin tenging við %1 á %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>Skrá inn</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Það eru möppur sem ekki eru samstilltar því þær eru of stórar: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Það eru möppur sem ekki eru samstilltar því þær ytri eru gagnageymslur: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Það eru möppur sem ekki eru samstilltar því þær eru of stórar eða eru ytri
gagnageymslur: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Staðfesta fjarlægingu aðgangs</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<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/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>Fjarlægja tengingu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>Opna möppu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>Skrá út</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>Halda samstillingu áfram</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>Gera hlé á samstillingu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Viltu í alvörunni hætta að samstilla möppuna
&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/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) af %2 í notkun. Sumar möppur, þar með taldar netmöppur tengdar í
skráakerfið eða sameignarmöppur, gætu verið með önnur takmörk.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>%1 af %2 í notkun</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>Það eru engar upplýsingar um gagnamagn fáanlegar í augnablikinu.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>Engin %1 tenging skilgreind.</translation>
</message>
@@ -479,103 +448,62 @@ skráakerfið eða sameignarmöppur, gætu verið með önnur takmörk.</transla
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>Skráð/ur út</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>Aftengt</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>Tengt</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>Þjónusta ekki tiltæk</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>Viðhaldshamur</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>Villa í netkerfi</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>Villa í stillingum</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>Spyr um auðkenni</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>Óþekkt staða notandaaðgangs</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation>Nánari upplýsingar</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation>Samþykkja</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation>Taka þátt</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation>Opna vafra</translation>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation>Samþykkja</translation>
- </message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
- <translation>Samstillt</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation>Prófa aftur allar innsendingar</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br/&gt;%1 aðgangurinn er ekki með virkniskráningu.</translation>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -686,12 +614,12 @@ skráakerfið eða sameignarmöppur, gætu verið með önnur takmörk.</transla
<translation>Enginn ownCloud aðgangur stilltur</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>Uppsettur þjónn fyrir þetta forrit er of gamall</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Uppfærðu í nýjasta þjóninn og endurræstu forritið.</translation>
</message>
@@ -909,36 +837,36 @@ nánari upplýsingar.</translation>
<translation>Gat ekki lesið kerfisútilokunarskrána</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Nýrri möppu stærri en %1 MB var bætt við: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>Möppu úr ytri gagnageymslu var bætt við.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Farðu í stillingarnar til að velja hana ef þú vilt sækja hana.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -947,7 +875,7 @@ This means that the synchronization client might not upload local changes immedi
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -955,46 +883,46 @@ If you decide to delete the files, they will be unavailable to you, unless you a
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>Öryggisafrit fannst</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>Venjuleg samstilling</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>Halda skrám á tölvunni við árekstra</translation>
</message>
@@ -1482,22 +1410,22 @@ Vertu viss um að ekkert annað forrit sé ekki að nota hana.</translation>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation>Villa við deilingu</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2632,7 +2560,7 @@ Ekki er mælt með því að hún sé notuð.
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>Hafna</translation>
</message>
@@ -2645,22 +2573,17 @@ Ekki er mælt með því að hún sé notuð.
<translation>Stillingar</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>Virkni</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>Almennt</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>Netkerfi</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>Aðgangur</translation>
</message>
@@ -2908,60 +2831,54 @@ Ekki er mælt með því að hún sé notuð.
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation>Deila með %1</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation>Deila í samhengisvalmynd</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation>Ég deildi einhverju með þér</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation>Afrita einkatengil á klippispjald</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation>Endurdeiling þessarar skráar er ekki leyfð</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation>Opna í vafra</translation>
</message>
@@ -3448,7 +3365,7 @@ Ekki er mælt með því að hún sé notuð.
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3456,17 +3373,68 @@ Ekki er mælt með því að hún sé notuð.
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<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>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3503,234 +3471,113 @@ Ekki er mælt með því að hún sé notuð.
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>Skráðu þig inn</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>Mappa %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>Það eru engar samstillingarmöppur stilltar.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>Opna í vafra</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>Skrá út</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>Nýlegar breytingar</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>Möppur í stýringu:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>Opna möppu &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>Opna %1 í vafra</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>Unknown status</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>Hjálp</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>Hætta í %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation>Aftengdist %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation>Óstudd útgáfa vefþjóns</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>Aftengt</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation>Aftengt frá sumum notendaaðgöngum</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>Aftengdist á notendareikningum:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>Aðgangur %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>Skráð/ur út</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>Samstilling aðgangs er óvirk</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>Samstilling er í bið</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation>Óleystir árekstrar</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>Villa við samstillingu</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation>Engar samstillingarmöppur stilltar</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation>Halda áfram með allar möppur</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>Setja allar möppur í bið</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation>Halda áfram með alla samstillingu</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation>Halda áfram með samstillingu</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>Gera hlé á öllum samstillingum</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>Gera hlé á samstillingu</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation>Hrynja núna</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation>Forrit</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>Ekkert samstillt nýlega</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation>Athuga með breytingar í fjartengdri &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation>Athuga með breytingar í staðværri &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation>Samstilli %1 af %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>Samstilli %1 (%2 eftir)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>Samstilli %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>Allt uppfært nú þegar</translation>
</message>
@@ -4005,7 +3852,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="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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 2436b1e1f..9141e8773 100644
--- a/translations/client_it.ts
+++ b/translations/client_it.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>Spazio di archiviazione: ...</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>Annulla</translation>
</message>
@@ -242,230 +242,199 @@
<translation>Connesso a &lt;server&gt; come &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>Nessun account configurato.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>Aggiungi nuovo</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>Rimuovi</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>Account</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation>Questo account supporta la cifratura End-To-End</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation>Abilita cifratura</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation>Mostra codice mnemonico E2E</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation>Cifra</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation>Modifica file ignorati</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>Scegli cosa sincronizzare</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>Forza ora la sincronizzazione</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>Riavvia sincronizzazione</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>Rimuovi connessione di sincronizzazione cartelle</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>Creazione della cartella non riuscita</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Conferma rimozione connessione di sincronizzazione cartelle</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>Rimuovi connessione di sincronizzazione cartelle</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>La sincronizzazione è in corso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>L&apos;operazione di sincronizzazione è in corso.&lt;br/&gt;Vuoi terminarla?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 in uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 come &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>La versione %1 del server è datata e non supportata! Continua a tuo rischio.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>Connesso a %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Il server %1 è temporaneamente non disponibile.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Il Server %1 è attualmente in manutenzione</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>Disconnesso da %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Ottenimento dell&apos;autorizzazione dal browser. &lt;a href=&apos;%1&apos;&gt;Fai clic qui&lt;/a&gt; per aprire nuovamente il browser.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>Nessuna connessione a %1 su %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>Accedi</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Ci sono nuove cartelle che non sono state sincronizzate poiché sono troppo grandi:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Ci sono nuove cartelle che non sono state sincronizzate poiché sono archiviazioni esterne:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Ci sono nuove cartelle che non sono state sincronizzate poiché sono troppo grandi o archiviazioni esterne:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Conferma rimozione account</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Vuoi davvero eliminare la connessione all&apos;account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; ciò &lt;b&gt;non&lt;/b&gt; eliminerà alcun file.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>Rimuovi connessione</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>Apri cartella</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>Esci</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>Riprendi la sincronizzazione</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>Sospendi la sincronizzazione</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;Impossibile creare la cartella locale &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Vuoi davvero fermare la sincronizzazione della cartella &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; ciò &lt;b&gt;non&lt;/b&gt; eliminerà alcun file.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) di %2 in uso. Alcune cartelle, incluse quelle montate in rete o le cartelle condivise, potrebbero avere limiti diversi.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>%1 di %2 in uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>Non ci sono informazioni disponibili sull&apos;utilizzo dello spazio di archiviazione.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation>Connessione a %1…</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>Nessuna connessione di %1 configurata.</translation>
</message>
@@ -473,103 +442,62 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>Disconnesso</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>Disconnesso</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>Connesso</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>Servizio non disponibile</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>Modalità Manutenzione</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>Errore di rete</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>Errore di configurazione</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>Richiesta credenziali</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>Stato dell&apos;account sconosciuto</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation>Altre informazioni</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation>Accetta</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation>Partecipa</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation>Apri nel browser</translation>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation>I file dall&apos;elnco degli ignorati così come i collegamenti simbolici non sono sincronizzati. Questo include:</translation>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation>Accetta</translation>
- </message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
- <translation>Sincronizzato</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation>Riprova tutti icaricamenti</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br/&gt;L&apos;account %1 non ha attività abilitate.</translation>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -680,12 +608,12 @@
<translation>Nessun account ownCloud configurato.</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>Il server configurato per questo client è troppo datato</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Aggiorna all&apos;ultima versione del server e riavvia il client.</translation>
</message>
@@ -901,14 +829,14 @@
<translation>Impossibile leggere il file di esclusione di sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Una nuova cartella più grande di %1 MB è stata aggiunta: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>Una nuova cartella da un&apos;archiviazione esterna è stata aggiunta.
@@ -916,22 +844,22 @@
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Vai nelle impostazioni e selezionala se vuoi scaricarla.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>La cartella %1 è stata creata, ma è stata esclusa dalla sincronizzazione in precedenza. I dati al suo interno non saranno sincronizzati.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Il file %1 è stato creato, ma è stato escluso dalla sincronizzazione in precedenza. Non sarà sincronizzato.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -944,7 +872,7 @@ Questo significa che il client di sincronizzazione potrebbe non caricare le modi
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -955,7 +883,7 @@ Se decidi di ripristinare i file, essi saranno sincronizzati nuovamente con il s
Se decidi di eliminare i file, non saranno più disponibili, a meno che tu sia il proprietario.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
@@ -964,22 +892,22 @@ Questi file saranno eliminati dal server e non saranno disponibili sugli altri t
Se questa azione non era voluta, puoi ripristinare subito i dati persi.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation>Vuoi eliminare tutti i file?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation>Elimina tutti i file</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation>Ripristina file eliminati</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -988,17 +916,17 @@ Ciò potrebbe verificarsi in seguito al ripristino di un backup sul server.
Se continui normalmente la sincronizzazione provocherai la sovrascrittura di tutti i tuoi file con file più datati in uno stato precedente. Vuoi mantenere i tuoi file locali più recenti come file di conflitto?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>Backup rilevato</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>Sincronizzazione normale</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>Mantieni i file locali come conflitto</translation>
</message>
@@ -1485,22 +1413,22 @@ Se continui normalmente la sincronizzazione provocherai la sovrascrittura di tut
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation>Password per condivisione richiesta</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<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/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation>Errore di condivisione</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2637,7 +2565,7 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>Annulla</translation>
</message>
@@ -2650,22 +2578,17 @@ Non è consigliabile utilizzarlo.</translation>
<translation>Impostazioni</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>Attività</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>Generale</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>Rete</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>Account</translation>
</message>
@@ -2911,60 +2834,54 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation>Condividi con %1</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation>Condivisione da menu contestuale</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation>Ho condiviso qualcosa con te</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation>Opzioni di condivisione</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation>Condividi tramite %1</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation>Invia collegamento privato tramite email…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation>Copia link privato negli appunti</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<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.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation>Copia collegamento pubblico</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation>Copia collegamento interno</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation>Apri nel browser</translation>
</message>
@@ -3451,7 +3368,7 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3459,17 +3376,68 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<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>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3506,234 +3474,113 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>Accedi</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>Cartella %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>Non è stata configurata alcuna cartella per la sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>Apri nel browser</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>Esci</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>Modifiche recenti</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>Cartelle gestite:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>Apri la cartella &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>Apri %1 nel browser...</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>Stato sconosciuto</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>Aiuto</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>Esci da %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation>Disconnesso dal %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation>Versione del server non supportata</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>Il server dell&apos;account %1 esegue una versione %2 datata e non supportata. L&apos;utilizzo del client con versioni non supportate non è sperimentato ed è potenzialmente pericoloso. Continua a tuo rischio.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>Disconnesso</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation>Disconnesso da un account</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>Disconnesso dagli account:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>Account %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>Disconnesso</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>La sincronizzazione dell&apos;account è disabilitata</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>La sincronizzazione è in pausa</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation>Conflitti non risolti</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>Errore durante la sincronizzazione</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation>Nessuna cartella configurata per la sincronizzazione</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation>Riprendi tutte le cartelle</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>Sospendi tutte le cartelle</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation>Accedi...</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation>Riprendi tutte le sincronizzazioni</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation>Riprendi la sincronizzazione</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>Sospendi tutte le sincronizzazioni</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>Sospendi la sincronizzazione</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Sincronizzazione di %1 di %2 (%3 rimanenti)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation>Chiusura immediata</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation>Applicazioni</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation>Impostazioni…</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation>Nuovo account...</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation>Visualizza altre attività…</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>Nessun elemento sincronizzato di recente</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation>Controllo delle modifiche in &apos;%1&apos; remoto</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation>Controllo delle modifiche in &apos;%1&apos; locale</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation>Sincronizzazione di %1 di %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>Sincronizzazione di %1 (%2 rimanenti)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>Sincronizzazione di %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>Aggiornato</translation>
</message>
@@ -4005,7 +3852,7 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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 0e79dab87..2a9cd05ff 100644
--- a/translations/client_ja.ts
+++ b/translations/client_ja.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>ストレージ空き容量: ...</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>キャンセル</translation>
</message>
@@ -242,230 +242,199 @@
<translation>&lt;server&gt; に &lt;user&gt; で接続中</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>アカウントが未設定です。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>新規追加</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>削除</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>アカウント</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation>このアカウントはエンドツーエンドの暗号化をサポートしています</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation>暗号化を有効にする</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation>E2Eニーモニックを表示</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation>暗号化</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation>無視するファイルを編集</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>同期フォルダーを選択</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>今すぐ強制的に同期</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>同期を再実行</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>同期フォルダー接続を削除</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>フォルダーの作成に失敗しました</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>同期フォルダー接続の削除を確認</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>同期フォルダー接続を削除</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>同期を実行中</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>同期作業を実行中です。&lt;br/&gt;終了しますか?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 を使用中</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>&lt;i&gt;%2&lt;/i&gt; の %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>サーバーバージョン %1 は古く、サポートされていません!自己責任で進めてください。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>%1 に接続</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>サーバー %1 は一時的に利用できません</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>サーバー %1 は現在メンテナンスモードです。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>%1 からサインアウトしました。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>ブラウザーから許可を取得。&lt;a href=&apos;%1&apos;&gt;ここをクリック&lt;/a&gt; してブラウザを再度開きます。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>%2 の %1 への接続がありません。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>ログイン</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>大きすぎるため同期されなかったフォルダーがあります:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>外部ストレージにあるため同期されなかったフォルダーがあります:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>大きすぎたか、外部ストレージにあるため同期されなかったフォルダーがあります:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>アカウント削除確認</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt; アカウント &lt;i&gt;%1&lt;/i&gt; を本当に削除しますか?&lt;/p&gt;&lt;p&gt;&lt;b&gt;注意:&lt;/b&gt; これによりファイルが一切削除されることはありません。&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>接続削除</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>フォルダーを開く</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>ログアウト</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>再開</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>一時停止</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;ローカルフォルダー &lt;i&gt;%1&lt;/i&gt; を作成できません。&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;フォルダー&lt;i&gt;%1&lt;/i&gt;の同期を本当に止めますか?&lt;/p&gt;&lt;p&gt;&lt;b&gt;注:&lt;/b&gt; これによりファイルが一切削除されることはありません。&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%2 の %1(%3%) 利用中。外部ネットワークストレージや共有フォルダーを含むフォルダーがある場合は、容量の上限値が異なる可能性があります。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>%2 のうち %1 を使用中</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>現在、利用できるストレージ利用状況はありません。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation>%1 に接続中…</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>%1 の接続は設定されていません。</translation>
</message>
@@ -473,103 +442,62 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>サインアウト</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>切断しました</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>接続しました</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>サービスが利用できません</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>メンテナンスモード</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>ネットワークエラー</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>設定エラー</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>証明書を要求</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>不明なアカウント状態</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation>詳細情報</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation>承諾</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation>参加</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation>ブラウザを開く</translation>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation>シンボリックリンクと同様に無視されるファイルは同期されません。以下の通り:</translation>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation>承諾</translation>
- </message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
- <translation>同期済</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation>すべてのアップロードを再試行</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br/&gt;%1 アカウントは、 アクティビティを有効にしていません。</translation>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -680,12 +608,12 @@
<translation>ownCloudアカウントが設定されていません</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>このクライアントのサーバー設定は古すぎます。</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>サーバーを最新にアップデートして、クライアントを再起動してください。</translation>
</message>
@@ -901,36 +829,36 @@
<translation>システム上の除外ファイルを読み込めません</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>%1 MB より大きな新しいフォルダーが追加されました: %2
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>外部ストレージからフォルダーが追加されました。
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>このフォルダーをダウンロードするには設定画面で選択してください。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>フォルダ%1は作成されましたが、以前に同期から除外されました。 中のデータは同期されません。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>ファイル%1は作成されましたが、以前に同期から除外されました。 このファイルは同期されません。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -943,7 +871,7 @@ This means that the synchronization client might not upload local changes immedi
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -954,7 +882,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a
ファイルを削除する場合、あなたがファイルを所有していない限り、ファイルは利用できなくなります。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
@@ -963,39 +891,39 @@ If this action was unintended you can restore the lost data now.</source>
この操作が意図しないものであった場合、削除されたデータはすぐに復元できます。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation>全てのファイルを削除しますか?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation>全てのファイルを削除する</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation>削除されたファイルを復元する</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation>この同期により同期フォルダー &apos;%1&apos; のファイルが以前のものに戻されます。 これは、バックアップがサーバー上に復元されたためです。 通常と同じように同期を続けると、すべてのファイルが以前の状態の古いファイルによって上書きされます。最新のローカルファイルを競合ファイルとして保存しますか?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>バックアップが検出されました</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>正常同期</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>コンフリクト時にローカルファイルを保持</translation>
</message>
@@ -1483,22 +1411,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation>共有エラー</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2632,7 +2560,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>閉じる</translation>
</message>
@@ -2645,22 +2573,17 @@ It is not advisable to use it.</source>
<translation>設定</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>アクティビティ</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>一般</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>ネットワーク</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>アカウント</translation>
</message>
@@ -2906,60 +2829,54 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation>%1 と共有</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation>コンテキストメニューの共有</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation>私はあなたと何かを共有しました</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation>共有オプション</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation>%1 経由で共有</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation>メールでプライベートリンクを送信…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation>プライベートリンクをクリップボードにコピーする</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation>このファイルの再共有は許可されていません</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation>公開リンクのコピー</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation>内部リンクをコピー</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation>ブラウザーで開く</translation>
</message>
@@ -3446,7 +3363,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3454,17 +3371,68 @@ It is not advisable to use it.</source>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>&lt;p&gt;このリリースは%1によって提供されました&lt;/p&gt;</translation>
</message>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3501,234 +3469,113 @@ It is not advisable to use it.</source>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>サインインしてください</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>フォルダー %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>同期するフォルダーがありません。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>ブラウザーで開く</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>ログアウト</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>最近変更されたファイル</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>管理フォルダー:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>フォルダー ’%1’ を開く</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>%1をブラウザーで開く</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>不明な状態</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>ヘルプ</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>%1 を終了</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation>%1 から切断されました</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation>サポートされていないサーバーバージョン</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>%1 アカウントのサーバーのバージョン %2 は古く、未サポートです。この未サポートのサーバーバージョンとこのクライアントでの組み合わせは、未テストで潜在的な危険があります。ご利用は自己責任でお願いいたします。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>切断しました</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation>一部のアカウントから切断されました</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>アカウントから切断:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>アカウント %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>サインアウト</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>アカウントの同期は無効になっています</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>同期が一時停止しています</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation>未解決の競合</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>同期中のエラー</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation>同期フォルダーが設定されていません</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation>すべてのフォルダーを再開する</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>すべてのフォルダーの同期を一時停止</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation>ログイン…</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation>すべての同期を再開する</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation>同期を再開する</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>すべての同期を一時停止</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>同期を一時停止</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>同期中 %2 中 %1 (残り %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation>クラッシュしました。</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation>アプリ</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation>設定…</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation>新規アカウント…</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation>さらにアクティビティを表示する…</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>最近同期されたアイテムはありません。</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation>リモート &apos;%1&apos;の変更を確認する</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation>ローカル &apos;%1&apos;の変更を確認する</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation>%2 の %1 を同期しています</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>同期中 %1 (残り %2)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>同期中 %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>最新です</translation>
</message>
@@ -4000,7 +3847,7 @@ It is not advisable to use it.</source>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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 c33bd3ca9..865413e3e 100644
--- a/translations/client_ko.ts
+++ b/translations/client_ko.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>저장소 공간: ...</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>취소</translation>
</message>
@@ -242,230 +242,199 @@
<translation>&lt;server&gt;와 &lt;user&gt;를 연결</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>설정한 계정이 없습니다.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>추가</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>삭제</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>계정</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation>이 계정은 종단간 암호화를 지원합니다.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation>암호화 사용</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation>E2E 연상 기호 보기</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation>암호화</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation>무시된 파일 수정</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>동기화 대상 선택</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>강제 동기화</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>동기화 다시 시작</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>동기화 폴더 연결 삭제</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>폴더 생성 실패</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>동기화 폴더 연결 삭제 확인</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>동기화 폴더 연결 삭제</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>동기화 </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>동기화가 진행중입니다.&lt;br/&gt;종료하시겠습니까?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 사용중</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1을 &lt;i&gt;%2&lt;/i&gt;로</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>서버 버전 %1은 오래되어 지원되지 않습니다. 책임 하에 진행하십시오.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>%1에 연결되었습니다.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>서버 %1을 일시적으로 사용할 수 없습니다.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>서버 %1이 현재 유지 보수 모드입니다.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>%1에서 로그아웃했습니다.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>브라우저에서 권한을 얻습니다. 브라우저를 다시 열려면 &lt;a href=&apos;%1&apos;&gt;여기&lt;/a&gt;를 클릭하십시오.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>%1와 %2에 연결이 없습니다.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>로그인</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>사이즈가 너무 커서 동기화 되지 않은 폴더가 있습니다:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>외부 저장소이므로 동기화되지 않은 폴더가 있습니다:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>사이즈가 너무 크거나 외부 저장소이므로 동기화되지 않은 폴더가 있습니다:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>계정 삭제 확인</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;계정 &lt;i&gt;%1&lt;/i&gt;과 연결을 삭제합니까?&lt;/p&gt;&lt;p&gt;&lt;b&gt;참고:&lt;/b&gt; 어떤 파일도 &lt;/b&gt;삭제하지 않습니다.&lt;/b&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>연결 삭제</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>폴더 열기</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>로그아웃</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>동기화 재개</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>동기화 일시 정지</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;폴더 &lt;i&gt;%1&lt;/i&gt;과 동기화를 중지합니까?&lt;/p&gt;&lt;p&gt;&lt;b&gt;참고:&lt;/b&gt; 어떤 파일도 &lt;b&gt;삭제하지 않습니다.&lt;/b&gt;&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%2의 %1 (%3%) 사용 중. 네트워크 탑재 또는 공유 폴더를 포함한 일부 폴더에는 다른 제한이 있을 수 있습니다.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>%2의 %1 사용중 </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>현재 사용 가능한 저장소 사용량 정보가 없습니다.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>%1 연결이 설정되지 않았습니다.</translation>
</message>
@@ -473,103 +442,62 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>로그아웃</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>연결 해제됨</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>연결됨</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>서비스 사용할 수 없음</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>유지 보수 모드</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>네트워크 오류</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>설정 오류</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>자격 증명 요청</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>알 수 없는 사용자 상태</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation>더 많은 정보</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation>수락</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation>참가</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation>브라우저 열기</translation>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation>무시 목록의 파일과 심볼릭 링크는 동기화되지 않습니다. 다음이 포함됩니다:</translation>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation>수락</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
- <translation>동기화됨</translation>
- </message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation>모든 업로드 다시 시도</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br/&gt;계정 %1은 사용가능한 활동이 없습니다.</translation>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -680,12 +608,12 @@
<translation>ownCloud 계정이 설정되지 않았습니다.</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>이 클라이언트에 대해 구성된 서버가 너무 오래되었습니다.</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>최신 서버로 업데이트 후 클라이언트를 다시 시작해주십시오.</translation>
</message>
@@ -901,36 +829,36 @@
<translation>시스템 제외 파일을 읽을 수 없습니다.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>%1 MB보다 큰 폴더가 추가되었습니다: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>외부 저장소의 폴더가 추가되었습니다.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>다운로드하려면 설정으로 이동하여 선택하십시오.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>%1 폴더가 생성되었으나 이전에 동기화에서 제외되었습니다. 그 안의 데이터는 동기화되지 않습니다.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>%1 파일이 생성되었으나 이전에 동기화에서 제외되었습니다. 동기화되지 않습니다.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -943,7 +871,7 @@ This means that the synchronization client might not upload local changes immedi
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -954,7 +882,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a
파일을 삭제하기로 결정한 경우 소유자가 아닌 한 해당 파일을 사용할 수 없습니다.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
@@ -963,22 +891,22 @@ If this action was unintended you can restore the lost data now.</source>
이 작업이 의도하지 않은 경우 손실된 데이터를 지금 복원 할 수 있습니다.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation>모든 파일을 삭제하시겠습니까?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation>모든 파일 삭제</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation>삭제된 파일 복구</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -987,17 +915,17 @@ Continuing the sync as normal will cause all your files to be overwritten by an
정상적으로 동기화를 계속하면 이전 파일의 이전 파일이 모든 파일을 덮어 씁니다. 로컬 최신 파일을 충돌 파일로 유지 하시겠습니까?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>백업이 발견되었습니다.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>일반 동기화</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>로컬 파일을 충돌 상태로 유지</translation>
</message>
@@ -1484,22 +1412,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation>오류 공유</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2638,7 +2566,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>무시</translation>
</message>
@@ -2651,22 +2579,17 @@ It is not advisable to use it.</source>
<translation>설정</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>활동</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>일반</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>네트워크</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>계정</translation>
</message>
@@ -2912,60 +2835,54 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation>%1 님과 공유</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation>연락처 메뉴 공유</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation>당신과 공유합니다.</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation>공유 옵션</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation>클립보드로 개인 링크 주소 복사</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation>이 파일을 다시 공유할 수 없습니다.</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation>공개 링크 복사</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation>내부 링크 복사</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation>브라우저에서 열기</translation>
</message>
@@ -3452,7 +3369,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3460,17 +3377,68 @@ It is not advisable to use it.</source>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>&lt;p&gt;이 릴리스는 %1에 의해 제공되었습니다.&lt;/p&gt;</translation>
</message>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3507,234 +3475,113 @@ It is not advisable to use it.</source>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>로그인 해주십시오.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>폴더 %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>설정된 동기화 폴더가 없습니다.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>브라우저에서 열기</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>로그아웃</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>최근 변경</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>관리되는 폴더:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>폴더 열기 &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>브라우저에서 %1 열기</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>알 수 없는 상태</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>도움말</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>%1 끝내기</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation>%1에서 연결 해제됨</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation>지원되지 않는 서버 버전</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>계정 %1의 서버가 지원되지 않는 이전 버전 %2을 실행합니다. 지원되지 않는 서버 버전으로 이 클라이언트를 사용하는 것은 테스트되지 않았으며 잠재적으로 위험합니다. 자신의 책임하에 진행하십시오.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>연결이 끊어졌습니다.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation>일부 계정에서 연결이 끊어졌습니다.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>계정에서 연결이 끊어졌습니다.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>계정 %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>로그아웃</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>계정 동기화가 비활성화되었습니다.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>동기화가 일시 정지되었습니다.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation>해결되지 않은 충돌</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>동기화 중 오류 발생</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation>설정된 동기화 폴더가 없음</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation>모든 폴더 재개</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>모든 폴더 일시 정지</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation>모든 동기화 재개</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation>동기화 재개</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>모든 동기화 일시 정지</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>동기화 일시 정지</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation>현재 충돌</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation>앱</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>최근에 동기화 된 항목이 없습니다.</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation>원격 &apos;%1&apos;의 변경 사항 확인 중</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation>로컬 &apos;%1&apos;의 변경 사항 확인 중</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation>%2 중 %1 동기화 중</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>%1 동기화 중(%2 남음)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>%1 동기화 중</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1(%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>최신 상태</translation>
</message>
@@ -4006,7 +3853,7 @@ It is not advisable to use it.</source>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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 6eeced5d5..3bf13b2be 100644
--- a/translations/client_lt_LT.ts
+++ b/translations/client_lt_LT.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>Saugyklos vieta: ...</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>Atsisakyti</translation>
</message>
@@ -242,230 +242,199 @@
<translation>Prisijungta su &lt;server&gt; kaip &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>Nėra sukonfiguruotų paskyrų.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>Pridėti naują</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>Šalinti</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>Paskyra</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation>Ši paskyra palaiko ištisinį šifravimą</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation>Įjungti šifravimą</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation>Šifruoti</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation>Taisyti nepaisomus failus</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>Pasirinkti ką sinchronizuoti</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>Inicijuoti sinchronizavimą dabar.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>Paleisti sinchronizavimą iš naujo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>Pašalinti aplankų sinchronizavimo ryšį</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>Aplanko sukūrimas nepavyko</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Patvirtinti aplankų sinchronizavimo ryšio pašalinimą</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>Pašalinti aplankų sinchronizavimo ryšį</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>Vyksta sinchronizavimas</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Vyksta sinchronizavimo operacija.&lt;br/&gt;Ar norite ją nutraukti?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 naudojama</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 kaip &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>Serverio versija %1 yra sena ir daugiau nepalaikoma. Jos naudojimas Jūsų pačių atsakomybė.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>Prisijungta prie %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Serveris %1 yra laikinai neprieinamas.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Šiuo metu serveris %1 yra techninės priežiūros veiksenoje.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>Atsijungta iš %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Autorizuojama vykdoma per naršyklę.&lt;a href=&apos;%1&apos;&gt;Paspauskite čia&lt;/a&gt;, jei norite iš naujo atidaryti naršyklę. </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>%2 neturi ryšio su %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>Prisijungti</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Yra aplankų, kurie nebuvo sinchronizuoti dėl to, kad buvo per dideli: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Aplankai, kurie nebuvo sinchronizuoti, kadangi jie yra išorinės saugyklos:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Yra aplankų, kurie nebuvo sinchronizuoti dėl to, kad buvo per dideli arba yra išorinės saugyklos: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Patvirtinti paskyros pašalinimą</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<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; Failai &lt;b&gt;nebus&lt;/b&gt; ištrinti.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>Šalinti ryšį</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>Atverti aplanką</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>Atsijungti</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>Pratęsti sinchronizavimą</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>Pristabdyti sinchronizavimą</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;Nepavyko sukurti vietinio aplanko &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Ar tikrai norite sustabdyti failų sinchronizavimą &lt;i&gt;%1&lt;/i&gt;? &lt;/p&gt;&lt;p&gt;&lt;b&gt;Pastaba:&lt;/b&gt; Failai &lt;b&gt;nebus&lt;/b&gt; ištrinti.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) iš %2 yra naudojami. Kai kuriuose aplankuose gali būti naudojami skirtingi apribojimai.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>%1 iš %2 yra naudojami</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>Šiuo metu nėra informacijos apie saugyklos panaudojimą.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation>Jungiamasi prie %1…</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>Nesukonfigūruota %1 sujungimų.</translation>
</message>
@@ -473,103 +442,62 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>Atsijungta</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>Atjungta</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>Prijungta</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>Paslauga nepasiekiama</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>Techninės priežiūros veiksena</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>Tinklo klaida</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>Konfigūracijos klaida</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>Klausiama prisijungimo duomenų</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>Nežinoma paskyros būsena</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation>Daugiau informacijos</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation>Priimti</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation>Prisijungti</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation>Atverti naršyklę</translation>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation>Priimti</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
- <translation>Sinchronizuota</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation>Bandyti viską įkelti iš naujo</translation>
- </message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br/&gt;Paskyra %1 neturi įjungtų veiklų.</translation>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -680,12 +608,12 @@
<translation>Nesukonfigūruota ownCloud paskyra</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>Serveris, sukonfigūruotas šiam klientui, yra per senas.</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Prašome atnaujinkite serverį iki naujausios versijos ir perkraukite klientą.</translation>
</message>
@@ -901,35 +829,35 @@
<translation>Nepavyko perskaityti sistemos išskyrimo failo</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Buvo pridėtas naujas, didesnis nei %1 MB, aplankas: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>Buvo pridėtas aplankas iš išorinė saugyklos.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Jei norite parsisiųsti, eikite į nustatymus.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Aplankas %1 buvo sukurtas, bet anksčiau buvo įtrauktas į praleidžiamų sąrašą. Ten esantys duomenys nebus sinchronizuoti.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Failas %1 buvo sukurtas, bet anksčiau buvo įtrauktas į praleidžiamų sąrašą. Failas nebus sinchronizuotas.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -938,7 +866,7 @@ This means that the synchronization client might not upload local changes immedi
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -946,29 +874,29 @@ If you decide to delete the files, they will be unavailable to you, unless you a
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation>Ištrinti visus failus?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation>Ištrinti visus failus</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation>Atkurti ištrintus failus</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -977,17 +905,17 @@ Taip gali nutikti, jei serveryje buvo atkurta atsarginė kopija.
Jei tęsite sinchronizavimą, Jūsų ankstesni failai bus perrašyti senesniais. Ar norite išsaugoti savo lokalius naujausius failus kaip konfliktinius failus?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>Aptikta atsarginė kopija</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>Įprasta sinchronizacija</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>Laikyti vietinius failus kaip konfliktinius</translation>
</message>
@@ -1476,22 +1404,22 @@ Jei tęsite sinchronizavimą, Jūsų ankstesni failai bus perrašyti senesniais.
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation>Dalinimosi klaida</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2625,7 +2553,7 @@ Patariama jo nenaudoti.</translation>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>Atmesti</translation>
</message>
@@ -2638,22 +2566,17 @@ Patariama jo nenaudoti.</translation>
<translation>Nustatymai</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>Veikla</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>Bendra</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>Tinklas</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>Paskyra</translation>
</message>
@@ -2899,60 +2822,54 @@ Patariama jo nenaudoti.</translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation>Dalintis su %1</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation>Kontekstinio meniu pasidalinimas</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation>Pasidalinau kai kuo su jumis</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation>Bendrinimo parinktys</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation>Bendrinti per %1</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation>Siųsti privačią nuorodą el. paštu…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation>Kopijuoti privačią nuorodą į mainų sritį</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation>Pakartotinai dalintis failu negalima</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation>Kopijuoti viešąją nuorodą</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation>Kopijuoti vidinę nuorodą</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation>Atverti naršyklėje</translation>
</message>
@@ -3439,7 +3356,7 @@ Patariama jo nenaudoti.</translation>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3447,17 +3364,68 @@ Patariama jo nenaudoti.</translation>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<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>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3494,234 +3462,113 @@ Patariama jo nenaudoti.</translation>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>Prisijunkite</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>Aplankas %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>Sinchronizuojamų aplankų nėra.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>Atverti naršyklėje</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>Atsijungti</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>Paskiausi pakeitimai</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>Valdomi aplankai:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>Atverti aplanką &quot;%1&quot;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>Atverti %1 naršyklėje</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>Nežinoma būsena</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>Pagalba</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>Išjungti %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation>Atsijungta nuo %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation>Nepalaikoma serverio versija</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>Serverio paskyra %1 naudoja seną arba nepalaikomą versiją %2. Kliento su nepalaikoma serverio versija naudojimas yra neištestuotas ir galimai žalingas. Tęskite savo pačių rizika.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>Atjungta</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation>Atjungta nuo kelių paskyrų</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>Atsijungta nuo paskyrų:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>Paskyra %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>Atsijungta</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>Paskyros sinchronizavimas išjungtas</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>Sinchronizavimas pristabdytas</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation>Neišspręsti konfliktai</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>Klaida sinchronizuojant</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation>Sinchronizuojamų aplankų nėra</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation>Tęsti visus aplankus</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>Pristabdyti visus aplankus</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation>Prisijungti…</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation>Tęsti visą sinchronizavimą</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation>Tęsti sinchronizavimą</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>Pristabdyti visą sinchronizavimą</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>Pristabdyti sinchronizavimą</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Sinchronizuojama %1 iš %2 (liko %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation>Crash now</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation>Programėlės</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation>Nustatymai…</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation>Nauja paskyra…</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation>Rodyti daugiau veiklos…</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>Neseniai sinchronizuotų elementų nėra</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation>Ieškoma pakeitimų serverio „%1“</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation>Ieškoma pakeitimų kompiuterio „%1“</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation>Sinchronizuojama %1 iš %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>Sinchronizuojama %1 (liko %2)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>Sinchronizuojama %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>Naujausi</translation>
</message>
@@ -3993,7 +3840,7 @@ Patariama jo nenaudoti.</translation>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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 16a88a3f5..647d5605a 100644
--- a/translations/client_lv.ts
+++ b/translations/client_lv.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>Krātuves vieta: ...</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>Atcelt</translation>
</message>
@@ -242,230 +242,199 @@
<translation>Savienojies ar &lt;server&gt; kā &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>Nav konfigurēts konts.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>Pievienot jaunu</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>Noņemt</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>Konts</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation>Ieslēgt šifrēšanu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation>Šifrēt</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>Izvēlies ko sinhronizēt</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>Piespeist tūlītēju sinhronizēšanu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>Restartēt sinronizāciju</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>Noņemt mapes sinhronizācijas savienojumu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>Mapes izveide neizdevās</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Noņemt mapes sinhronizācijas savienojuma noņemšanai</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>Noņemt mapes sinhronizācijas savienojumu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>Notiek Sinhronizācija</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Pašlaik notiek sinhronizācijas operācija.&lt;br/&gt;Vai to izbeigt?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 tiek lietots</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 kā &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>Servera versija %1 ir novecojusi un netiek atbalstīta! Turpini un paša atbildību.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>Savienots ar %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Serveris %1 ir īslaicīgi nepiejams.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Serveris %1 pašlaik ir uzturēšanas režīmā</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>Izrakstījies no %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Saņemam pilnvaru no pārlūka. &lt;a href=&apos;%1&apos;&gt;Noklikšķini šeit&lt;/a&gt;lai atkārtoti atvērtu pārlūku.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>Nav savienojuma ar %1 pie %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>Pieteikties</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Šīs mapes netika sinhronizētas, jo tās ir pārāk lielas:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Šīs mapes netika sinhronizētas, jo tās atrodas ārējās krātuvēs:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Šīs mapes netika sinhronizētas, jo tās ir pārāk lielas, vai atrodas ārējās krātuvēs:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Apstiprini Konta noņemšanai</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<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;Vai tiešām vēlaties noņemt savienojumu kontam &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Piezīme:&lt;/b&gt; Tas &lt;b&gt;neveiks&lt;/b&gt; nekādu datņu dzēšanu.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>Noņemt savienojumu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>Atvērt mapi</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>Iziet</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>Turpināt sinhronizāciju</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>Apturēt sinhronizāciju</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Vai tiešām vēlaties apturēt mapes &lt;i&gt;%1&lt;/i&gt; sinhronizēšanu?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Piezīme:&lt;/b&gt; Tas &lt;b&gt;neveiks&lt;/b&gt; nekādu datņu dzēšanu.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) no %2 izmantots. Dažas mapes, tajā skaitā montētas no tīkla vai koplietotas, var saturēt dažādus ierobežojumus.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>%1 no %2 izmantots</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>Pašlaik nav pieejama diska vietas informācija.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>Nav %1 savienojums konfigurēts.</translation>
</message>
@@ -473,103 +442,62 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>Izrakstījies</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>Atvienojies</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>Savienojies</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>Serviss nav pieejams</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>Uzturēšanas režīms</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>Tīkla kļūda</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>Konfigurācijas kļūda</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>Pieprasa atkreditāciju</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>Nezināms konta stāvoklis</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation>Vairāk infomrācijas</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation>Akceptēt</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation>Pievienoties</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation>Atvērt pārlūku</translation>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation>Akceptēt</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
- <translation>Sinhronizēts</translation>
- </message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation>Atkārtot visas augšupielādes</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br/&gt;Kontam %1 darbības nav iespējots.</translation>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -680,12 +608,12 @@
<translation>Nav konfigutēts ownCloud konts</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>Konfigurētais serveris ir par vecu priekš šī klienta</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Lūdzu atjaunini uz jaunāko servera versiju un atkārtoti palaid klientu.</translation>
</message>
@@ -901,36 +829,36 @@
<translation>Nevarēja nolasīt sistēmas izņēmumu datni.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Jauna mape lielāka par %1 MB ir tikusi pievienota: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>Mape no ārējās krātuves ir tikusi pievienota.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Lūdzu ieej iestatījumos un izvēlies to, ja tu to gribi lejupielādēt.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -939,7 +867,7 @@ This means that the synchronization client might not upload local changes immedi
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -947,46 +875,46 @@ If you decide to delete the files, they will be unavailable to you, unless you a
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>Dublējums atrasts</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>Saglabāt lokālās datnes kā konfliktu</translation>
</message>
@@ -1473,22 +1401,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2618,7 +2546,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation type="unfinished"/>
</message>
@@ -2631,22 +2559,17 @@ It is not advisable to use it.</source>
<translation>Iestatījumi</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>Darbības</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>Vispārīgs</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>Tīkls</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>Konts</translation>
</message>
@@ -2892,60 +2815,54 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation>Kopēt privāto saiti starpliktuvē</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation type="unfinished"/>
</message>
@@ -3430,7 +3347,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3438,17 +3355,68 @@ It is not advisable to use it.</source>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<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>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3485,234 +3453,113 @@ It is not advisable to use it.</source>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>Lūdzu piesakieties</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>Mape %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>Nav konfigurētas sinhronizācijas mapes.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>Atvērt pārlūkā</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>Atteikties</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>Nesenās izmaiņas</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>Pārvaldīt mapes:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>Atvērt mapi &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>Atvērt %1 pārlūkā</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>Nezināms statuss</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>Palīdzība</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>Iziet %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation>Atvienojies no %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation>Neatbalstīta servera versija</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>Serveris kontam %1 darbojās uz novecojušas un neatbalstītas versijas %2. Šī klienta izmantošana ar neatbalstītu servera versiju nav testēta un ir potenciāli bīstama. Turpini to uz sava riska.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>Atvienojies</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation>Atvienojies no dažiem kontiem</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>Atvienojies no kontiem:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>Konts %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>Atteicies</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>Konta sinhronizācija ir atspējota</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>Sinhronizācija ir apturēta</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation>Neatrisināts konflikts</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>Kļuda sinhronizējot</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation>Nav konfigurētas sinhronizācijas mapes</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation>Turpināt visas mapes</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>Apturēt visas mapes</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation>Turpināt visu sinhronizāciju</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation>Turpināt sinhronizāciju</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>Apturēt visu sinhronizāciju</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>Apturēt sinhronizāciju</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation>Nobrucināt tagad</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation>Lietotnes</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>Nesen nekas netika sinhronizēts</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation>Pārbauda izmaiņas attālinātajā &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation>Pārbauda izmaiņas lokālajā &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation>Sinhronizē %1 no %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>Sinhronizē %1 (%2 atlicis)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>Sinhronizē %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>Atjaunināts</translation>
</message>
@@ -3984,7 +3831,7 @@ It is not advisable to use it.</source>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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_nb_NO.ts b/translations/client_nb_NO.ts
index 7175a9d58..38f3a91f5 100644
--- a/translations/client_nb_NO.ts
+++ b/translations/client_nb_NO.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>Lagringsplass: …</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>Avbryt</translation>
</message>
@@ -242,230 +242,199 @@
<translation>Tilkoblet &lt;server&gt; som &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>Ingen konto konfigurert.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>Legg til ny</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>Fjern</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>Konto</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation>Denne kontoen støtter ende-til-ende kryptering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation>Aktiver kryptering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation>Vis E2E mnemonic</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation>Krypter</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation>Rediger ignorerte filer</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>Velg hva som synkroniseres</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>Tving synkronisering nå</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>Synkroniser på ny</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>Fjern tilkobling for synkronisering av mappe</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>Oppretting av mappe feilet</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Bekreft fjerning av tilkobling for synkronisering av mappe</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>Fjern tilkobling for mappe-synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>Synkroniserer...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Synkronisering kjører.&lt;br/&gt;Vil du avbryte den?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 i bruk</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 som &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>Server-versjonen %1 er gammel og støttes ikke! Fortsett på egen risiko.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>Tilkoblet %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Server %1 er midlertidig utilgjengelig.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Server %1 er for øyeblikket i vedlikeholdsmodus.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>Logget ut fra %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>Ingen tilkobling til %1 på %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>Logg inn</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Noen mapper ble ikke synkronisert fordi de er for store</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Noen mapper ble ikke synkronisert fordi de er eksterne lagringsplasser:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Noen mapper ble ikke synkronisert fordi de er for store eller de er eksterne lagringsplasser:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Bekreft fjerning av konto</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Vil du virkelig fjerne tilkoblingen til kontoen &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Merk:&lt;/b&gt; Dette vil &lt;b&gt;ikke&lt;/b&gt; slette noen filer.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>Fjern tilkobling</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>Åpne mappe</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>Logg ut</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>Fortsett synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>Sett synkronisering på pause</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Vil du virkelig stoppe synkronisering av mappen &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Merk:&lt;/b&gt; Dette vil &lt;b&gt;ikke&lt;/b&gt; slette noen filer.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) av %2 i bruk. Noen mapper, inkludert nettverkstilkoblede eller delte mapper, kan ha andre begrensninger.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>%1 av %2 i bruk</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>Ingen informasjon om bruk av lagringsplass tilgjengelig for øyeblikket.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>Ingen %1-forbindelse konfigurert.</translation>
</message>
@@ -473,103 +442,62 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>Logget ut</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>Frakoblet</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>Tilkoblet</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>Tjeneste utilgjengelig</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>Vedlikeholdsmodus</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>Nettverksfeil</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>Konfigurasjonsfeil</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>Ukjent kontotilstand</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation>Mer informasjon</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation>Aksepter</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation>Bli med</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation>Åpne nettleser</translation>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation>Aksepter</translation>
- </message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
- <translation>Synkronisert</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation>Prøv alle opplastinger igjen</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br/&gt;Konto %1 har ikke aktiviteter aktivert.</translation>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -680,12 +608,12 @@
<translation>Ingen Nextcloud-konter konfigurert</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>Den konfigurerte serveren for denne klienten er for gammel</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Vennligst oppdatert til den nyeste serveren og start klienten på nytt.</translation>
</message>
@@ -901,35 +829,35 @@
<translation>Klarte ikke å lese systemets ekskluderingsfil</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>En ny mappe større enn %1 MB er blitt lagt til: %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>En mappe fra et eksternt lager er blitt lagt til.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Gå til Innstillinger og velg den hvis du ønsker å laste den ned.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -938,7 +866,7 @@ This means that the synchronization client might not upload local changes immedi
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -946,29 +874,29 @@ If you decide to delete the files, they will be unavailable to you, unless you a
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation>Vil du slett alle filer?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation>Slette alle filer</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation>Gjenopprett slettede filer</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -977,17 +905,17 @@ Dette kan være fordi en backup ble gjenopprettet på serveren.
Hvis synkroniseringen fortsetter som normalt, vil alle filene dine bli overskrevet av en eldre fil i en tidligere tilstand. Ønsker du å beholde dine ferskeste lokale filer som konflikt-filer?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>Backup oppdaget</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>Normal synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>Behold lokale filer som konflikt</translation>
</message>
@@ -1474,22 +1402,22 @@ Hvis synkroniseringen fortsetter som normalt, vil alle filene dine bli overskrev
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation>Delingsfeil</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2623,7 +2551,7 @@ Det er ikke tilrådelig å bruke den.</translation>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>Forkast</translation>
</message>
@@ -2636,22 +2564,17 @@ Det er ikke tilrådelig å bruke den.</translation>
<translation>Innstillinger</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>Aktivitet</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>Generelt</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>Nettverk</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>Konto</translation>
</message>
@@ -2897,60 +2820,54 @@ Det er ikke tilrådelig å bruke den.</translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation>Del med %1</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation>Jeg delte noe med deg</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation>Alternativer for deling</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation>Kopier privat lenke til utklippstavlen</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation>Videre deling av denne filen er ikke tillatt</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation>Kopier offentlig lenke</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation>Kopier intern lenke</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation>Åpne i nettleser</translation>
</message>
@@ -3437,7 +3354,7 @@ Det er ikke tilrådelig å bruke den.</translation>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3445,17 +3362,68 @@ Det er ikke tilrådelig å bruke den.</translation>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3492,234 +3460,113 @@ Det er ikke tilrådelig å bruke den.</translation>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>Vennligst logg inn</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>Mappe %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>Ingen synkroniseringsmapper er konfigurert.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>Åpne i nettleser</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>Logg ut</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>Siste endringer</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>Administrerte mapper:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>Åpne mappe &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>Åpne %1 i nettleser</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>Ukjent status</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>Hjelp</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>Avslutt %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation>Koble fra %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation>Server-versjonen støttes ikke</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>Serveren på konto %1 kjører en gammel %2 som ikke støttes. Bruk av denne klienten med ikke-støttede server-versjoner er ikke testet og kan være farlig. Fortsett på egen risiko.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>Frakoblet</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>Koblet fra kontoer:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>Konto %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>Logget ut</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>Kontosynkronisering er deaktivert</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>Synkronisering er satt på pause</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>Sett alle mapper på pause</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>Sett all synkronisering på pause</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>Sett synkronisering på pause</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation>Krasj nå</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation>Apper</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>Ingenting synkronisert nylig</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation>Synkroniserer %1 av %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>Synkroniserer %1 (%2 gjenstår)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>Synkroniserer %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>Oppdatert</translation>
</message>
@@ -3991,7 +3838,7 @@ Det er ikke tilrådelig å bruke den.</translation>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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 be3a99baa..3f70bc5a6 100644
--- a/translations/client_nl.ts
+++ b/translations/client_nl.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>Opslagruimte: ...</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>Annuleren</translation>
</message>
@@ -242,230 +242,199 @@
<translation>Verbonden met &lt;server&gt; als &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>Geen account ingesteld.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>Toevoegen nieuw</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>Verwijder</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>Account</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation>Dit account ondersteunt end-to-endversleuteling</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation>Encryptie activeren</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation>Tonen E2E mnemonic</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation>Versleutelen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation>Bewerken genegeerde bestanden</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>Selectieve synchronisatie</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>Forceer sync nu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>Herstarten sync</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>Verwijderen map sync verbinding</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>Maken map mislukt</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Bevestig verwijderen Map Sync verbinding</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>Verwijderen Map Sync verbinding</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>Bezig met synchroniseren</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Bezig met synchroniseren.&lt;br/&gt;Wilt u stoppen met synchroniseren?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 in gebruik</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 als &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>De serverversie %1 is oud en wordt niet meer ondersteund. Verdergaan is op eigen risico.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>Verbonden met %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Server %1 is tijdelijk niet beschikbaar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Server %1 momenteel in onderhoudsmodus.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>Uitgelogd van %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Authorization van de browser verkrijgen. &lt;a href=&apos;%1&apos;&gt;Klik hier&lt;/a&gt; om de browser te heropenen.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>Geen verbinding met %1 op %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>Meld u aan</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Er zijn mappen die niet gesynchroniseerd werden, omdat ze te groot zijn:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Er zijn mappen die niet gesynchroniseerd werden, omdat ze op externe opslag staan:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Er zijn mappen die niet gesynchroniseerd werden, omdat ze te groot zijn of op externe opslag staan:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Bevestig verwijderen account</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Wilt u echt de verbinding met het account &lt;i&gt;%1&lt;/i&gt; verbreken?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Let op:&lt;/b&gt; Hierdoor verwijdert u &lt;b&gt;geen&lt;/b&gt; bestanden.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>Verwijderen verbinding</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>Openen map</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>Afmelden</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>Hervatten sync</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>Pauzeren sync</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;Kon lokale map &lt;i&gt;%1&lt;/i&gt; niet maken.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Weet u zeker dat u de synchronisatie van map &lt;i&gt;%1&lt;/i&gt; wilt stoppen?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Opmerking:&lt;/b&gt; Dit zal &lt;b&gt;geen&lt;/b&gt; bestanden verwijderen.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) van %2 in gebruik. Sommige mappen, inclusief netwerkmappen en gedeelde mappen, kunnen andere limieten hebben.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>%1 van %2 in gebruik</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>Er is nu geen informatie over het gebruik van de opslagruimte beschikbaar.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation>Verbinden met %1 ...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>Geen %1 connectie geconfigureerd.</translation>
</message>
@@ -473,103 +442,62 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>Afgemeld</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>Niet verbonden</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>Verbonden</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>Dienst niet beschikbaar</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>Onderhoudsmodus</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>Netwerkfout</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>Configuratiefout</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>Vragen naar inloggegevens</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>Onbekende account-status</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation>Meer informatie</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation>Accepteren</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation>Deelnemen</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation>Openen browser</translation>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation>Bestanden uit de negeerlijst en symbolische koppelingen worden niet gesynchroniseerd. Dit bevat:</translation>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation>Accepteren</translation>
- </message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
- <translation>Gesynchroniseerd</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation>Probeer alle uploads opnieuw</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br/&gt;Account %1 heeft geen activiteiten ingeschakeld.</translation>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -680,12 +608,12 @@
<translation>Geen ownCloud-account geconfigureerd</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>De voor dit programma ingestelde server is te oud</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Werk de server bij naar de nieuwste versie en herstart het programma.</translation>
</message>
@@ -901,36 +829,36 @@
<translation>Kon het systeem-uitsluitingsbestand niet lezen</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Er is een nieuwe map groter dan %1 MB toegevoegd: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>Er is een map op externe opslag toegevoegd.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Ga naar de instellingen om het te selecteren als u deze wilt downloaden.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Map %1 is gecreëerd, maar eerder uitgesloten van synchronisatie. Bestanden erin worden niet gesynchroniseerd.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Bestand %1 is gecreëerd, maar eerder uitgesloten van synchronisatie. Het wordt niet gesynchroniseerd.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -943,7 +871,7 @@ Dit betekent dat de synchronisatieclient misschien niet meteen lokale wijziginge
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -954,7 +882,7 @@ Als u besluit de bestanden te herstellen, worden ze opnieuw gesynchroniseerd met
Als u besluit de bestanden te verwijderen, zijn ze niet beschikbaar voor u, tenzij u de eigenaar bent.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
@@ -963,22 +891,22 @@ Deze bestanden worden ook van de server worden verwijderd en zullen niet op je a
Als dit onbedoeld was kan je de bestanden nu herstellen.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation>Alle bestanden verwijderen?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation>Verwijder alle bestanden</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation>Herstel verwijderde bestanden</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -987,17 +915,17 @@ Dit kan komen doordat een backup is hersteld op de server.
Doorgaan met deze synchronisatie overschrijft al je bestanden door een eerdere versie. Wilt je jouw lokale meer recente bestanden behouden als conflict bestanden?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>Backup gedetecteerd</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>Normale synchronisatie</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>Behoud lokale bestanden als conflict</translation>
</message>
@@ -1485,22 +1413,22 @@ Doorgaan met deze synchronisatie overschrijft al je bestanden door een eerdere v
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation>Wachtwoord voor deellink vereist</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<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/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation>Fout bij delen</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2642,7 +2570,7 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>Terzijde leggen</translation>
</message>
@@ -2655,22 +2583,17 @@ We adviseren deze site niet te gebruiken.</translation>
<translation>Instellingen</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>Activiteit</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>Algemeen</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>Netwerk</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>Account</translation>
</message>
@@ -2916,60 +2839,54 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation>Delen met %1</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation>Contextmenu delen</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation>Ik deelde iets met u</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation>Deelopties</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation>Delen via %1</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation>Verstuur privélink per e-mail ---</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation>Kopiëren privé-link naar klembord</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<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.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation>Kopieer openbare link</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation>Kopieer interne link</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation>Openen in browser</translation>
</message>
@@ -3456,7 +3373,7 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3464,17 +3381,68 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<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>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3511,234 +3479,113 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>Log alstublieft in</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>Map %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>Er zijn geen synchronisatie-mappen geconfigureerd.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>Open in browser</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>Afmelden</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>Recente wijzigingen</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>Beheerde mappen:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>Open map &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>Open %1 in browser</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>Onbekende status</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>Help</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>%1 afsluiten</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation>Losgekoppeld van %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation>Niet-ondersteunde server versie</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>De server van account %1 gebruikt een oude versie %2. Het gebruik van deze clientsoftware met niet-ondersteunde server versies is niet getest en mogelijk gevaarlijk. Verdergaan is op eigen risico.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>Niet verbonden</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation>Niet verbonden met sommige accounts</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>Losgekoppeld van account:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>Account %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>Afgemeld</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>Account synchronisatie is uitgeschakeld</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>Synchronisatie is gepauzeerd</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation>Niet opgeloste conflicten</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>Fout bij synchronisatie</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation>Geen syncmappen geconfigureerd</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation>Doorgaan met alle mappen</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>Pauzeer alle mappen</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation>Inloggen ...</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation>Doorgaan met alle synchronisaties</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation>Doorgaan met synchronisatie</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>Pauzeer alle synchronisatie</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>Pauzeer synchronisatie</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Sync %1 van %2 (%3 over)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation>Crash nu</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation>Apps</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation>Instellingen ...</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation>Nieuw account …</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation>Bekijk meer activiteiten...</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>Recent niets gesynchroniseerd</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation>Controleren op wijzigingen in externe &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation>Controleren op wijzigingen in lokale &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation>Synchroniseren %1 van %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>Sync %1 (%2 over)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>Synchroniseren %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>Bijgewerkt</translation>
</message>
@@ -4010,7 +3857,7 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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_pl.ts b/translations/client_pl.ts
index b24e8c280..186cd4635 100644
--- a/translations/client_pl.ts
+++ b/translations/client_pl.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>Przestrzeń: …</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>Anuluj</translation>
</message>
@@ -242,230 +242,199 @@
<translation>Połączony z &lt;server&gt; jako &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>Brak skonfigurowanych kont.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>Dodaj nowe</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>Usuń</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>Konto</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation>To konto obsługuje szyfrowanie typu end-to-end</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation>Włącz szyfrowanie</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation>Pokaż klucz E2E</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation>Szyfruj</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation>Edytuj pliki ignorowane</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>Wybierz elementy do synchronizacji</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>Zsynchronizuj teraz</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>Uruchom ponownie synchronizację</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>Usuń folder synchronizacji</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>Utworzenie katalogu nie powiodło się</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Potwierdź usunięcie folderu synchronizacji</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>Usuń folder synchronizacji</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>Synchronizacja uruchomiona</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Operacja synchronizacji jest uruchomiona.&lt;br/&gt;Czy chcesz ją zakończyć?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>Wykorzystane: %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 jako &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>Wersja serwera %1 jest przestarzała i nie jest już wspierana. Kontynuujesz na własne ryzyko.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>Podłączony do %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Serwer %1 jest tymczasowo niedostępny.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Serwer %1 jest obecnie w trybie konserwacji.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>Wylogowano z %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Uzyskanie autoryzacji z przeglądarki. &lt;a href=&apos;%1&apos;&gt;Kliknij tutaj&lt;/a&gt;, aby ponownie otworzyć przeglądarkę.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>Brak połączenia do %1 z %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>Zaloguj</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Te katalogi nie zostały zsynchronizowane ponieważ są zbyt duże:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Te katalogi nie zostały zsynchronizowane, ponieważ znajdują się w magazynach zewnętrznych: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Te katalogi nie zostały zsynchronizowane, ponieważ są zbyt duże lub znajdują się w magazynach zewnętrznych: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Potwierdź usunięcie konta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Czy na pewno chcesz usunąć połączenie z kontem &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Uwaga:&lt;/b&gt; Ta operacja &lt;b&gt;nie&lt;/b&gt; usunie plików klienta.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>Usuwanie połączenia</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>Otwórz folder</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>Wyloguj</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>Przywróć synchronizację</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>Zatrzymaj synchronizację</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;Nie można utworzyć folderu lokalnego &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Czy na pewno chcesz zatrzymać synchronizację folderu &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Uwaga:&lt;/b&gt; ta operacja &lt;b&gt;nie&lt;/b&gt; usunie plików z klienta.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) z %2 w użyciu. Niektóre foldery, w tym zamontowane lub udostępnione foldery w sieci, mogą mieć różne limity.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>Wykorzystane: %1 z %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>Obecnie nie ma dostępnych informacji o wykorzystaniu pamięci masowej.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation>Łączenie do %1…</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>Połączenie %1 nie skonfigurowane.</translation>
</message>
@@ -473,103 +442,62 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>Odłączony</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>Rozłączony</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>Połączony</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>Usługa niedostępna</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>Tryb konserwacji</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>Błąd sieci</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>Błąd konfiguracji</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>Zapytanie o poświadczenia</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>Status konta nieznany</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation>Więcej informacji</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation>Akceptuj</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation>Dołącz</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation>Otwórz przeglądarkę</translation>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation>Pliki z listy ignorowanych oraz dowiązania symboliczne nie są synchronizowane. Uwzględnia to:</translation>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation>Akceptuj</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
- <translation>Zsynchronizowany</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation>Ponów wysyłanie</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br/&gt;Użytkownik %1 nie ma włączonej historii aktywności.</translation>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -680,12 +608,12 @@
<translation>Nie skonfigurowano konta ownCloud</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>Konfigurowany serwer dla tego klienta jest za stary</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Proszę zaaktualizować serwer do najnowszej wersji i zrestartować klienta.</translation>
</message>
@@ -901,36 +829,36 @@
<translation>Nie można przeczytać pliku wyłączeń</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Nowy folder większy niż %1MB został dodany: %2
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>Folder z pamięci zewnętrznej został dodany .
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Przejdź do ustawień żeby go zaznaczyć i pobrać.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Folder %1 został utworzony, ale wcześniej został wykluczony z synchronizacji. Dane w nim zawarte nie zostaną zsynchronizowane.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Plik %1 został utworzony, ale wcześniej został wykluczony z synchronizacji. Dane w nim zawarte nie zostaną zsynchronizowane.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -943,7 +871,7 @@ Oznacza to, że klient synchronizacji może nie przesłać lokalnych zmian natyc
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -954,7 +882,7 @@ Jeśli zdecydujesz się przywrócić pliki i posiadasz odpowiednie uprawnienia,
Jeśli zdecydujesz się je usunąć, nie będą już dostępne.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
@@ -963,22 +891,22 @@ Pliki te zostaną usunięte z serwera i nie będą dostępne na innych urządzen
Jeśli ta akcja była niezamierzona, możesz teraz przywrócić utracone dane.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation>Usunąć wszystkie pliki?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation>Usuń wszystkie pliki</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation>Przywróć usunięte pliki</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -987,17 +915,17 @@ Przyczyną może być przywrócenie plików z kopii zapasowej na serwerze.
Kontynuacja synchronizacji w normalny sposób spowoduje, że wszystkie Twoje pliki zostaną zastąpione starszym plikiem we wcześniejszym stanie. Czy chcesz zachować najnowsze pliki lokalne?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>Wykryto kopię zapasową.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>Normalna synchronizacja.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>Zatrzymaj pliki lokalne i ustaw status konfliktu.</translation>
</message>
@@ -1484,22 +1412,22 @@ Kontynuacja synchronizacji w normalny sposób spowoduje, że wszystkie Twoje pli
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation>Wymagane hasło do udostępnienia</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<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/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation>Udostępnianie błędu</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2637,7 +2565,7 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>Anuluj</translation>
</message>
@@ -2650,22 +2578,17 @@ Niezalecane jest jego użycie.</translation>
<translation>Ustawienia</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>Aktywność</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>Ogólne</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>Sieć</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>Konto</translation>
</message>
@@ -2911,60 +2834,54 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation>Udostępnij %1</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation>Menu kontekstowe udostępniania</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation>Udostępniłem/am ci coś</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation>Opcje udostępniania</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation>Udostępnij przez %1</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation>Wyślij link prywatny e-mailem...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation>Skopiuj link prywatny do schowka</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation>Udostępnianie pliku jest zabronione</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation>Kopiuj link publiczny</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation>Kopiuj link wewnętrzny</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation>Otwórz w przeglądarce</translation>
</message>
@@ -3451,7 +3368,7 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3459,17 +3376,68 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<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>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3506,234 +3474,113 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>Proszę się zalogować</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>Folder %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>Nie skonfigurowano żadnych folderów synchronizacji.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>Otwórz w przeglądarce</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>Wyloguj</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>Ostatnie zmiany</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>Zarządzane foldery:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>Otwórz katalog &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>Otwórz %1 w przeglądarce</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>Nieznany status</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>Pomoc</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>Wyjdź z %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation>Rozłączony z %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation>Nie wspierana wersja serwera</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>Serwer dla konta %1 uruchomiony jest na starej i niewspieranej wersji %2. Używanie klienta z niewspieranym serwerem nie zostało przetestowane i jest potencjalnie niebezpieczne. Kontynuujesz na własne ryzyko. </translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>Rozłączony</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation>Odłączono kilka kont</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>Rozłączony z kontami:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>Dostęp %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>Odłączony</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>Konto synchronizacji jest wyłączone</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>Synchronizacja jest wstrzymana</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation>Nierozpoznane konflikty</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>Błąd w trakcie synchronizacji</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation>Nie skonfigurowano folderów do synchronizacji</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation>Przywróć wszystkie foldery</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>Wstrzymaj wszystkie foldery</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation>Zaloguj...</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation>Przywróć wszystkie synchronizacje</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation>Wznów synchronizację</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>Wstrzymaj wszystkie synchronizacje</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>Wstrzymaj synchronizację</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Synchronizacja %1 z %2 (pozostało %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation>Program przestał działać</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation>Aplikacje</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation>Ustawienia…</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation>Nowe konto…</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation>Wyświetl więcej aktywności...</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>Brak ostatnich synchronizacji</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation>Sprawdzanie zmian w zdalnym &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation>Sprawdzanie zmian w lokalnym &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation>Synchronizowane %1 z %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>Synchronizuję %1 (%2 pozostało)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>Synchronizowanie %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>Aktualne</translation>
</message>
@@ -4005,7 +3852,7 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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_pt.ts b/translations/client_pt.ts
index 0e0432ce7..51806e8d0 100644
--- a/translations/client_pt.ts
+++ b/translations/client_pt.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>Espaço de armazenamento: ...</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
@@ -242,230 +242,199 @@
<translation>Ligado ao &lt;server&gt; como &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>Nenhuma conta configurada.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>Adicionar nova</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>Remover</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>Conta</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation>Esta conta suporta encriptação ponto-a-ponto</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation>Ativar a encriptação</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation>Mostrar Mnemónica E2E</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation>Encriptar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation>Editar Ficheiros Ignorados</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>Escolher o que sincronizar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>Forçar a sincronização</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>Retomar sincronização</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>Remover ligação de sincronização de pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>Não foi possível criar a pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Confirmar Remoção da Ligação de Sincronização de Pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>Remover Ligação da Sincronização de Pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>Sincronização em Execução</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>A operação de sincronização está em execução.&lt;br/&gt;Deseja terminá-la?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 em utilização</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 como &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>A versão %1 do servidor é antiga e não é suportada! Prossiga por sua conta e risco.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>Ligado a %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>O servidor %1 está temporariamente indisponível.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>O Servidor %1 encontra-se em manutenção</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>Terminou a sessão de %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>A obter autorização do browser &lt;a href=&apos;%1&apos;&gt;Clique aqui&lt;/a&gt; para reabrir o browser</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>Sem ligação para %1 em %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>Iniciar Sessão</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Existem pastas que não foram sincronizadas por serem demasiado grandes:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Existem pastas que não foram sincronizadas por serem armazenamento externo:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Existem pastas que não foram sincronizadas por serem demasiado grandes ou armazenamento externo:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Confirmar Remoção da Conta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Deseja mesmo remover a ligação da conta &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; isto &lt;b&gt;não&lt;/b&gt; irá eliminar quaisquer ficheiros.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>Remover ligação</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>Abrir pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>Terminar sessão</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>Retomar sincronização</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>Pausar sincronização</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Deseja mesmo parar a sincronização da pasta &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; isto &lt;b&gt;não&lt;/b&gt; irá eliminar qualquer ficheiro.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) de %2 em utilização. Algumas pastas, incluindo a rede montada ou as pastas partilhadas, podem ter limites diferentes.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>%1 de %2 em utilização</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>Atualmente não está disponível nenhuma informação da utilização do armazenamento.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>%1 sem ligação configurada.</translation>
</message>
@@ -473,103 +442,62 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>Sessão terminada</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>Desligado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>Ligado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>Serviço indisponível</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>Modo de Manutenção</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>Erro de rede</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>Erro de configuração</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>Perguntar Credenciais</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>Estado de conta desconhecido</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation>Mais informação</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation>Aceitar</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation>Aderir</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation>Abrir o navegador</translation>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation>Ficheiros da lista de ignorados bem com links simbólicos não são sincronizados. Isto inclui:</translation>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation>Aceitar</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
- <translation>Sincronizado</translation>
- </message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation>Repetir todos os envios</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br/&gt;A conta %1 não tem atividades ativadas.</translation>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -680,12 +608,12 @@
<translation>Não foi configurada nenhuma conta ownCloud</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>O servidor configurado para este cliente é muito antigo</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Por favor, atualize para a ultima versão do servidor e reinicie o cliente.</translation>
</message>
@@ -901,36 +829,36 @@
<translation>Não foi possível ler o ficheiro excluir do sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Foi adicionada uma nova pasta maior que %1 MB: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>Foi adicionada uma pasta vinda de armazenamento externo.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Por favor, vá às definições para a selecionar, se desejar transferi-la.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>A pasta% 1 foi criada, mas foi excluída da sincronização anteriormente. Os dados dentro dela não serão sincronizados.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>A pasta% 1 foi criada, mas foi excluída da sincronização anteriormente. Não será sincronizada.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -939,7 +867,7 @@ This means that the synchronization client might not upload local changes immedi
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -947,29 +875,29 @@ If you decide to delete the files, they will be unavailable to you, unless you a
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation>Eliminar todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation>Eliminar todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation>Restaurar ficheiros apagados</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -978,17 +906,17 @@ Isto pode ser porque um backup foi restaurado no servidor.
Continuando a sincronização fará com que todos os seus ficheiros sejam substituídos por um ficheiro mais velho num estado anterior. Deseja manter os seus ficheiros locais mais recentes como ficheiros de conflito?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>Detetada cópia de segurança</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>Sincronização Normal</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>Manter Ficheiros Locais como Conflito</translation>
</message>
@@ -1475,22 +1403,22 @@ Continuando a sincronização fará com que todos os seus ficheiros sejam substi
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation>Erro de partilha</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2624,7 +2552,7 @@ Não é aconselhada a sua utilização.</translation>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>Rejeitar</translation>
</message>
@@ -2637,22 +2565,17 @@ Não é aconselhada a sua utilização.</translation>
<translation>Definições</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>Atividade</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>Geral</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>Rede</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>Conta</translation>
</message>
@@ -2898,60 +2821,54 @@ Não é aconselhada a sua utilização.</translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation>Partilhar com %1</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation>Partilha do menu de contexto</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation>Partilhei alguma coisa consigo</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation>Opções de partilha</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<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.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation>Voltar a partilhar não é permitido</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation>Copiar link publico</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation>Copiar ligação interna</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation>Abrir no navegador</translation>
</message>
@@ -3438,7 +3355,7 @@ Não é aconselhada a sua utilização.</translation>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3446,17 +3363,68 @@ Não é aconselhada a sua utilização.</translation>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<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>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3493,234 +3461,113 @@ Não é aconselhada a sua utilização.</translation>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>Por favor inicie a sessão</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>Pasta %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>Não há pastas de sincronização configurado.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>Abrir no navegador</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>Terminar sessão</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>Alterações recentes</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>Pastas Geridas:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>Abrir pasta &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>Abrir %1 no navegador</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>Estado desconhecido</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>Ajuda</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>Sair do %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation>Desconetado de %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation>Versão de servidor não suportada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>O servidor na conta %1 está a correr uma versão %2 antiga e não suportada. O uso deste cliente com versões de servidor não suportadas não está testado e é potencialmente perigos. Prossiga por sua conta e risco.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>Desligado</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation>Desconectado de algumas contas</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>Desconetado das contas:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>Conta %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>Sessão terminada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>A sincronização de contas está desactivada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>Sincronização em pausa</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation>Conflitos por resolver</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>Erro durante a sincronização</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation>Não há pastas de sincronização configuradas</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation>Continuar todas as pastas</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>Pausar todas as pastas</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation>Continuar toda a sincronização</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation>Continuar sincronização</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>Pausar toda a sincronização</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>Pausar sincronização</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation>Crash agora</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation>Apps</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>Sem itens sincronizados recentemente</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation>A procurar por alterações em remoto &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation>A procurar por alterações em local &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation>A sincronizar %1 de %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>A sincronizar %1 (%2 em falta)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>A sincronizar %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>Atualizado</translation>
</message>
@@ -3992,7 +3839,7 @@ Não é aconselhada a sua utilização.</translation>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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 e6cb6c617..2b935df95 100644
--- a/translations/client_pt_BR.ts
+++ b/translations/client_pt_BR.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>Espaço de armazenamento:...</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
@@ -242,230 +242,199 @@
<translation>Conectado com &lt;server&gt; como &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>Nenhuma conta configurada.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>Adicionar nova</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>Remover</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>Conta</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation>Esta conta suporta criptografia de ponta-a-ponta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation>Ativar criptografia</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation>Exibir mnemônico E2E</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation>Criptografar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation>Editar Arquivos a Ignorar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>Escolher o que sincronizar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>Forçar sincronização agora</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>Reiniciar a sincronização</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>Remover a conexão de sincronização de pastas</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>Falha na criação da pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Confirmar a Remoção da Sincronização de Pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>Remover a Conexão de Sincronização de pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>Sincronização ocorrendo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>A operação de sincronização está ocorrendo.&lt;br/&gt;Deseja finalizá-la?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 em uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 como &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>A versão do servidor %1 é antiga e não suportada! Prossiga por conta própria.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>Conectado a %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>O servidor %1 está temporariamente indisponível.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>O servidor %1 está em modo de manutenção.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>Desconectado de %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Obtendo autorização do navegador. &lt;a href=&apos;%1&apos;&gt;Clique aqui&lt;/a&gt; para reabrir o navegador.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>Sem conexão para %1 em %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>Entrar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Existem pastas que não foram sincronizadas porque são muito grandes:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Existem pastas que não foram sincronizadas porque são armazenamentos externos:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Existem pastas que não foram sincronizadas porque são muito grandes ou são armazenamentos externos: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Confirmar a Remoção da Conta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Deseja realmente remover a conexão desta conta&lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Isto &lt;b&gt;não&lt;/b&gt; irá excluir nenhum arquivo.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>Remover conexão</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>Abrir pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>Sair</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>Retomar sincronização</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>Pausar sincronização</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;Não foi possível criar a pasta local &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Deseja realmente parar a sincronização desta pasta &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Isto &lt;b&gt;não&lt;/b&gt; vai excluir qualquer arquivo.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) de %2 em uso. Algumas pastas, incluindo as montadas na rede ou pastas compartilhadas, podem ter limites diferentes.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>%1 de %2 em uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>Atualmente, não há informação disponível do uso de armazenamento.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation>Conectando a %1 …</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>Nenhuma conexão %1 configurada.</translation>
</message>
@@ -473,103 +442,62 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>Serviço indisponível</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>Modo de manutenção</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>Erro de rede</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>Erro de configuração</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>Solicitando credenciais</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>Estado desconhecido da conta</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation>Mais informações</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation>Aceitar</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation>Juntar-se</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation>Abrir Navegador</translation>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation>Os arquivos da lista de ignorados e os links simbólicos não são sincronizados. Isso inclui:</translation>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation>Aceitar</translation>
- </message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
- <translation>sincronizado</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation>Retentar todos os envios</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br/&gt;A conta %1 não tem atividades ativadas.</translation>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -680,12 +608,12 @@
<translation>Nenhuma conta ownCloud configurada</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>O servidor configurado para este cliente é muito antigo</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Por favor, atualize para a última versão e reinicie o cliente.</translation>
</message>
@@ -901,36 +829,36 @@
<translation>Não foi possível ler o sistema de arquivo de exclusão</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Uma nova pasta maior que %1 MB foi adicionada: %2
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>Uma pasta de um armazenamento externo foi adicionada.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Por favor, vá nas configurações para selecioná-lo se desejar baixá-lo.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>A pasta %1 foi criada, mas foi excluída da sincronização anteriormente. Dados dentro dela não serão sincronizados.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>O arquivo %1 foi criado, mas foi excluído da sincronização anteriormente. Não será sincronizado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -943,7 +871,7 @@ Isso significa que o cliente de sincronização pode não fazer upload de altera
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -954,7 +882,7 @@ Se você decidir restaurar os arquivos, eles serão sincronizados novamente com
Se você decidir excluir os arquivos, eles não estarão disponíveis para você, a menos que você seja o proprietário.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
@@ -963,22 +891,22 @@ Esses arquivos serão excluídos do servidor e não estarão disponíveis nos se
Se essa ação não foi intencional, você pode restaurar os dados perdidos agora.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation>Excluir todos os arquivos?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation>Excluir todos os arquivos</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation>Restaurar arquivos excluídos</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -987,17 +915,17 @@ Isso pode ser porque um backup foi restaurado no servidor.
Continuar a sincronização como normal fará com que todos os seus arquivos sejam substituídos por um arquivo antigo em um estado anterior. Deseja manter seus arquivos mais recentes locais como arquivos conflitantes?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>Backup detectado</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>Sincronização Normal</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>Manter Arquivos Locais como Conflito</translation>
</message>
@@ -1484,22 +1412,22 @@ Continuar a sincronização como normal fará com que todos os seus arquivos sej
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation>É necessária uma senha de compartilhamento</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<source>Please enter a password for your link share:</source>
<translation>Digite uma senha para seu link:</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation>Erro de compartilhamento</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2637,7 +2565,7 @@ Não é aconselhável usá-la.</translation>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>Dispensar</translation>
</message>
@@ -2650,22 +2578,17 @@ Não é aconselhável usá-la.</translation>
<translation>Configurações</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>Atividade</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>Geral</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>Rede</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>Conta</translation>
</message>
@@ -2911,60 +2834,54 @@ Não é aconselhável usá-la.</translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation>Compartilhar com %1</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation>Compartilhamento do menu de contexto</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation>Eu compartilhei algo com você</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation>Opções de compartilhamento</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation>Compartilhar via %1</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation>Enviar link privado por e-mail...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<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.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation>Não é permitido recompartilhar este arquivo</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation>Copiar link público</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation>Copiar link interno</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation>Abrir no navegador</translation>
</message>
@@ -3451,7 +3368,7 @@ Não é aconselhável usá-la.</translation>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3459,17 +3376,68 @@ Não é aconselhável usá-la.</translation>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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 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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<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>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3506,234 +3474,113 @@ Não é aconselhável usá-la.</translation>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>Favor conectar</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>Pasta %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>Não há pastas de sincronização configuradas.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>Abrir no navegador</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>Sair</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>Alterações recentes</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>Pastas Gerenciadas:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>Abrir pasta &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>Abrir %1 no navegador</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>Status desconhecido</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>Ajuda</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>Sair %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation>Desconectado de %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation>Versão do Servidor Não Suportada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>O servidor na conta %1 roda uma versão antiga %2 não suportada. Usar esse cliente junto com versões não suportadas e não testadas é potencialmente perigoso. Prossiga por sua conta.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation>Desconectado de algumas contas</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>Desconectado de contas:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>Conta %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>A sincronização de conta está desativada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>A sincronização está pausada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation>Conflitos não resolvidos</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>Erro durante a sincronização</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation>Nenhuma pasta de sincronização configurada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation>Retomar todas as pastas</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>Pausar todas as pastas</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation>Entrar...</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation>Retomar todas as sincronizações</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation>Retomar a sincronização</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>Pausa todas as sincronizações</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>Pausar a sincronização</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Sincronizando %1 de %2 (faltam %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation>Quebrar agora</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation>Aplicativos</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation>Configurações...</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation>Nova conta...</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation>Ver mais atividades...</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>Não há itens sincronizados recentemente</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation>Checando por alterações no remoto &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation>Checando por alterações no local &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation>Sincronizando %1 de %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>Sincronizando %1 (%2 faltando)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>Sincronizando %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>Até a data</translation>
</message>
@@ -4005,7 +3852,7 @@ Não é aconselhável usá-la.</translation>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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 9dbcef330..4e17b8289 100644
--- a/translations/client_ro.ts
+++ b/translations/client_ro.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation type="unfinished"/>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>Anulează</translation>
</message>
@@ -242,230 +242,199 @@
<translation>Conectat cu &lt;server&gt;ca &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>Niciun cont configurat.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>Adaugă nou</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>Șterge</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>Cont</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation>Contul permite criptare end-to-end.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation>Activează criptarea</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation>Encrypt</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation>Editează fișierele ignorate</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>Alege ce să sync</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>Forțează sync acum</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>Repornește sync</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>Crearea directorului a eșuat</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>Sync în desfășurare</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 folosiți</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>Conectat la %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Serverul %1 este temporar indisponibil.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Serverul %1 este momentan in mentenanță,</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>Deautentificat de la %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>Autentificare</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>Deschide director</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>Ieșire</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>Reia sync</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>Pauză sync</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>%1 din %2 utilizat</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation type="unfinished"/>
</message>
@@ -473,102 +442,61 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>Deconenctat</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>Conectat</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>Serviciu indisponibil</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>Mod mentenanță</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>Eroare de rețea</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>Eroare de configurare</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation>Accept</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation>Deschide Browser</translation>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
- <translation>Syncronizat</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
</context>
@@ -680,12 +608,12 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation type="unfinished"/>
</message>
@@ -901,34 +829,34 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -937,7 +865,7 @@ This means that the synchronization client might not upload local changes immedi
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -945,46 +873,46 @@ If you decide to delete the files, they will be unavailable to you, unless you a
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation>Ștergi toate fișierele?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation>Șterge toate fișierele</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation>Restaurează fișierele șterse</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>Backup detectat</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@@ -1471,22 +1399,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation>Eroare la partajare</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2616,7 +2544,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>Înlătură</translation>
</message>
@@ -2629,22 +2557,17 @@ It is not advisable to use it.</source>
<translation>Setări</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>Activitate</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>General</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>Rețea</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>Cont</translation>
</message>
@@ -2890,60 +2813,54 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation>Partajat cu %1</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation>Am partajat ceva cu tine</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation>Copiză link public</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation>Copiază linkul intern</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation>Deschide în Browser</translation>
</message>
@@ -3428,7 +3345,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3436,17 +3353,68 @@ It is not advisable to use it.</source>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3483,234 +3451,113 @@ It is not advisable to use it.</source>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>Director %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>Deschide în Browser</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>Ieșire</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>Modificări recente</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>Deschide director &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>Deschide %1 în Browser</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>Status necunoscut</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>Ajutor</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>Deconenctat</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation>Deconectat de la unele conturi</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>Deconectat de la conturile:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>Cont %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation>Conflicte nerezolvate</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation>Aplicații</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation type="unfinished"/>
</message>
@@ -3982,7 +3829,7 @@ It is not advisable to use it.</source>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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 4f908dcfe..53f1efccd 100644
--- a/translations/client_ru.ts
+++ b/translations/client_ru.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>Размер хранилища: ...</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>Отмена</translation>
</message>
@@ -242,230 +242,199 @@
<translation>Установлено соединение с &lt;server&gt; с учётной записью &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>Учётная запись не настроена.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>Добавить новую</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>Удалить</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>Учётная запись</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation>Эта учетная запись поддерживает сквозное шифрование</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation>Включить шифрование</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation>Показать мнемофразу E2E</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation>Зашифровать</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation>Список исключений синхронизации…</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>Выбрать объекты для синхронизации</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>Принудительно запустить синхронизацию</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>Перезапустить синхронизацию</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>Отключить синхронизацию папки</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>Ошибка создания папки</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Подтверждение отключения синхронизации папки</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>Отключить синхронизацию папки</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>Синхронизация запущена</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Выполняется синхронизация.&lt;br/&gt;Действительно прервать операцию? </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>Используется %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 под именем &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>Сервер версии %1 устарел и не поддерживается. Продолжайте на свой страх и риск.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>Соединен с %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Сервер %1 временно недоступен.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Сервер %1 в настоящее время находится в режиме технического обслуживания.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>Успешно вышли из %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Получение авторизации из браузера. &lt;a href=&apos;%1&apos;&gt;Нажмите здесь&lt;/a&gt;, чтобы повторно открыть браузер.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>Нет соединения с %1 в %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>Войти</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Есть папки, которые не синхронизированы, так как их размер превышает установленное ограничение:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Есть папки, которые не были синхронизированы, так как они являются внешними хранилищами:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Есть папки, которые не были синхронизированы, так как их размер превышает установленное ограничение или они являются внешними хранилищами:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Подтверждение удаления учетной записи</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Действительно удалить подключение к учётной записи &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Примечание:&lt;/b&gt; Это действие &lt;b&gt;НЕ&lt;/b&gt; приведёт к удалению файлов.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>Удалить подключение</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>Открыть папку</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>Выйти</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>Возобновить синхронизацию</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>Приостановить синхронизацию</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;Не удалось создать локальную папку: &lt;i&gt;«%1»&lt;/i&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Действительно остановить синхронизацию папки &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Примечание:&lt;/b&gt; Это действие &lt;b&gt;НЕ&lt;/b&gt; приведёт к удалению файлов.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>Используется %1 (%3%) из %2. Некоторые папки, включая сетевые или общие, могут иметь свои собственные ограничения.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>Используется %1 из %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>В данный момент информация о заполненности хранилища недоступна.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation>Подключение к %1…</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>Нет настроенного подключения %1.</translation>
</message>
@@ -473,103 +442,62 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>Выполнен выход из учётной записи</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>Отключено</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>Подключено</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>Сервис недоступен</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>Режим технического обслуживания.</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>Ошибка сети</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>Ошибка конфигурации</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>Запрос учётных данных</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>Неизвестное состояние учетной записи</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation>Дополнительная информация</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation>Принять</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation>Присоединиться</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation>Открыть файловый менеджер</translation>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation>Из синхронизации исключены символьные ссылки и следующие файлы:</translation>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation>Принять</translation>
- </message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
- <translation>Синхронизировано</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation>Повторить передачу файлов на сервер</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br/&gt;У учетной записи %1 не включены события.</translation>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -680,12 +608,12 @@
<translation>Учётная запись OwnCloud не настроена</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>Настроенный сервер слишком стар для этого клиента</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Обновите сервер до последней версии и перезапустите клиент.</translation>
</message>
@@ -901,36 +829,36 @@
<translation>Невозможно прочесть системный файл исключений</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Добавлена новая папка «%2», размер которой превышает %1 МБ.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>Добавлена папка внешнего хранилища.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Чтобы скачать его, перейдите в параметры приложения и отметьте его для синхронизации.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Создана папка «%1» создана, но ранее она была исключена из синхронизации. Данные внутри этой папки не будут синхронизированы.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Создан файл «%1», но ранее он был исключён из синхронизации. Этот файл не будет синхронизирован.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -942,7 +870,7 @@ This means that the synchronization client might not upload local changes immedi
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -953,46 +881,46 @@ If you decide to delete the files, they will be unavailable to you, unless you a
При выборе «Удалить файлы», файлы станут недоступны, кроме случая, когда вы являетесь их владельцем.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation>Удалить все файлы?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation>Удалить все файлы</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation>Восстановить удалённые файлы</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation>Эта синхронизация собирается сбросить файлы в катлоге &apos;%1&apos; в более ранее состояние. Такое может случиться, если на сервере восстановлена резервная копия. Если продолжать синхронизацию как обычно, то ваши файлы будут перетёрты более старыми версиями. Хотите сохранить ваши локальные свежие файлы в качестве конфликтных?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>Обнаружена резервная копия</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>Обычная синхронизация</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>Сохранить локальные файлы как конфликтующие</translation>
</message>
@@ -1479,22 +1407,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation>Требуется задать пароль для общего ресурса</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<source>Please enter a password for your link share:</source>
<translation>Задайте пароль для доступа по ссылке:</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation>Ошибка общего доступа</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2629,7 +2557,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>Отклонить</translation>
</message>
@@ -2642,22 +2570,17 @@ It is not advisable to use it.</source>
<translation>Параметры</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>События</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>Основные</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>Сеть</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>Учётная запись</translation>
</message>
@@ -2903,60 +2826,54 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation>Предоставить доступ %1</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation>Контекстное меню предоставления общего доступа</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation>Я поделился с тобой</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation>Общий доступ…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation>%1 — Предоставление общего доступа </translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation>Отправить закрытую ссылку по электронной почте...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation>Скопировать закрытую ссылку в буфер обмена</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation>Повторное открытие доступа запрещено</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation>Скопировать общедоступную ссылку</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation>Скопировать внутреннюю ссылку</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation>Открыть в браузере</translation>
</message>
@@ -3443,7 +3360,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3451,17 +3368,68 @@ It is not advisable to use it.</source>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>&lt;p&gt;Этот выпуск подготовлен %1&lt;/p&gt;</translation>
</message>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3498,234 +3466,113 @@ It is not advisable to use it.</source>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>Войдите в систему</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>Каталог %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>Синхронизация папок не настроена.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>Открыть в браузере</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>Выйти</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>Недавние изменения</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>Управляемые каталоги:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>Открыть каталог &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>Открыть %1 в браузере</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>Неизвестный статус</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>Помощь</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>Закрыть %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation>Отключен от %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation>Версия сервера не поддерживается</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>Сервер для учетной записи %1 использует старую не поддерживаемую версию %2. Использование этого клиента совместно с не поддерживаемым сервером не тестировалось и является потенциально небезопасным. Вы продолжаете на свой страх и риск.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>Отключено</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation>Отключено от некоторых учётных записей</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>Отключен от учетных записей:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>Учетная запись %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>Выполнен выход из учётной записи</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>Синхронизация учётной записи отключена</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>Синхронизация приостановлена</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation>Неразрешённые конфликты</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>Ошибка во время синхронизации</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation>Не настроено ни одного каталога для синхронизации</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation>Возобновить синхронизацию всех папок</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>Поставить на паузу все папки</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation>Войти...</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation>Возобновить все синхронизации</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation>Возобновить синхронизацию</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>Приостановить все синхронизации</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>Приостановить синхронизацию</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Синхронизация %1 из %2 (осталось %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation>Критическая ошибка!</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation>Приложения</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation>Параметры...</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation>Новая учётная запись…</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation>Посмотреть больше событий...</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>Недавно ничего не синхронизировалось</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation>Проверка наличия изменений на сервере: «%1»</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation>Проверка наличия изменений в локальной папке «%1»</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation>Синхронизация %1 из %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>Синхронизация %1 (осталось %2)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>Синхронизация %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>Актуальная версия</translation>
</message>
@@ -3997,7 +3844,7 @@ It is not advisable to use it.</source>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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_sk.ts b/translations/client_sk.ts
index 21de857df..0704d03a1 100644
--- a/translations/client_sk.ts
+++ b/translations/client_sk.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>Úložný priestor: ...</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>Zrušiť</translation>
</message>
@@ -242,230 +242,199 @@
<translation>Spojené z &lt;server&gt; ako &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>Žiadny účet nie je nastavený.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>Pridať nový účet</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>Odobrať</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>Účet</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation>Tento účet podporuje šifrovanie end-to-end</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation>Zapnúť šifrovanie</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation>Zobaziť E2E mnemotechnické</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation>Zašifrovať</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation>Upraviť ignorované súbory</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>Vybrať čo synchronizovať</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>Vynútiť synchronizáciu teraz</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>Reštartovať synchronizáciu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>Odstrániť prepojenie priečinka</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>Vytvorenie priečinka zlyhalo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Potvrdiť odstránenie prepojenia priečinka</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>Odstrániť prepojenie priečinka</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>Prebiehajúca synchronizácia</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Proces synchronizácie práve prebieha.&lt;br/&gt;Chcete ho ukončiť?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 sa používa</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 ako &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>Verzia servera %1 je stará a nepodporovaná. Pokračujte na vlastné nebezpečenstvo.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>Pripojené k %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Server %1 je dočasne nedostupný.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Server %1 je momentálne v režime údržby.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>Odhlásený z %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Získavam autorizáciu z prehliadača. &lt;a href=&apos;%1&apos;&gt;Kliknite sem&lt;/a&gt; na opätovné otvorenie prehliadača.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>Žiadne pripojenie k %1 na %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>Prihlásiť sa</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Tieto priečinky neboli synchronizované pretože sú príliš veľké:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Niektoré priečinky neboli synchronizované, pretože sú na externom úložisku</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Niektoré priečinky neboli synchronizované, pretože sú príliš veľké alebo sú na externom úložisku</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Potvrďte ostránenie účtu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<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ým sa &lt;b&gt;nevymažú&lt;/b&gt; žiadne súbory.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>Vymazať pripojenie</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>Otvoriť priečinok</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>Odhlásiť</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>Obnoviť synchronizáciu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>Pozastaviť synchronizáciu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;Nie je možné vytvoriť lokálny priečinok &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Naozaj si prajete zastaviť synchronizácu priečinka &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Poznámka:&lt;/b&gt; Toto &lt;b&gt;nevymaže&lt;/b&gt; žiadne súbory.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) z %2 je využitých. Niektoré priečinky, vrátane sieťových a zdieľaných, môžu mať iné limity.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>%1 z %2 je využitých</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>Teraz nie sú k dispozícii žiadne informácie o využití úložiska.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation>Pripája sa k %1 …</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>Žiadne nakonfigurované %1 spojenie</translation>
</message>
@@ -473,103 +442,62 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>Odhlásený</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>Odpojený</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>Pripojené</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>Služba nedostupná</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>Mód údržby</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>Chyba siete</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>Chyba nastavenia</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>Zisťujem prihlasovacie údaje</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>Neznámy stav účtu</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation>Viac informácií</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation>Prijať</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation>Pripojiť</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation>Otvoriť prehliadač</translation>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation>Súbory zo zoznamu ignorovaných ako aj symbolické linky sa nesynchronizujú. Toto zahŕňa:</translation>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation>Prijať</translation>
- </message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
- <translation>Zosynchronizované</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation>Zopakovať všetky nahrávania</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br/&gt;Účet %1 nemá zapnuté aktivity.</translation>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -680,12 +608,12 @@
<translation>Žiadny účet v ownCloude nie je nastavený</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>Server nakonfigurovaný pre tohto klienta je príliš starý</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Prosím aktualizujte na najnovšiu verziu servera a reštartujte klienta.</translation>
</message>
@@ -901,36 +829,36 @@
<translation>Nemožno čítať systémový exclude file</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Bol pridaný nový priečinok väčší ako %1 MB: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>Bol pridaný priečinok z externého úložiska.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Ak si to prajete prevziať, tak prejdite do nastavení a vyberte to.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Priečinok %1 bol vytvorený, ale bol už skôr vylúčený zo synchronizácie. Nebude preto synchronizovaný.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Súbor %1 bol vytvorený, ale bol už skôr vylúčený zo synchronizácie. Nebude preto synchronizovaný.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -943,7 +871,7 @@ To znamená, že klient synchronizácie nemusí okamžite odovzdať lokálne zme
% 1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -954,7 +882,7 @@ Ak sa rozhodnete lokálne súbory ponechať, budú znovu synchronizované so ser
Ak sa rozhodnete súbory vymazať tak následne už nebudú dostupné (ak nie ste vlastník).</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
@@ -963,22 +891,22 @@ Tieto súbory budú vymazané na serveri a nebudú dostupné na vašich ostatný
Teraz máte ešte možnosť obnoviť stratené dáta.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation>Zmazať všetky súbory?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation>Zmazať všetky súbory</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation>Obnoviť zmazané súbory</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -987,17 +915,17 @@ Toto môže byť spôsobené obnovením zálohy na strane servera.
Pokračovaním v synchronizácii spôsobí prepísanie všetkých vašich súborov staršími súbormi z predchádzajúceho stavu. Chcete ponechat svoje lokálne najaktuálnejšie súbory ako konfliktné súbory?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>Záloha je dostupná</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>Bežná synchronizácia</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>Ponechať lokálne súbory ako konfliktné</translation>
</message>
@@ -1484,22 +1412,22 @@ Pokračovaním v synchronizácii spôsobí prepísanie všetkých vašich súbor
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation>Pre sprístupnenie je potrebné heslo</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<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/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation>Chyba sprístupnenia</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2637,7 +2565,7 @@ Nie je vhodné ju používať.</translation>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>Odmietnuť</translation>
</message>
@@ -2650,22 +2578,17 @@ Nie je vhodné ju používať.</translation>
<translation>Nastavenia</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>Aktivita</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>Všeobecné</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>Sieť</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>Účet</translation>
</message>
@@ -2911,60 +2834,54 @@ Nie je vhodné ju používať.</translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation>Sprístupniť %1</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation>Sprístupnenie kontextovej ponuky</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation>Niečo som vám sprístupnil</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation>Možnosti zdieľania</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation>Sprístupniť prostredníctvom %1</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation>Odoslať privátny odkaz e-mailom…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation>Kopírovať privátny odkaz do schránky</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<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.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation>Kopírovať verejný odkaz</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation>Kopírovať interný odkaz</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation>Otvoriť v prehliadači</translation>
</message>
@@ -3451,7 +3368,7 @@ Nie je vhodné ju používať.</translation>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3459,17 +3376,68 @@ Nie je vhodné ju používať.</translation>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<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>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3506,234 +3474,113 @@ Nie je vhodné ju používať.</translation>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>Prihláste sa prosím</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>Priečinok %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>Nie sú nastavené žiadne priečinky na synchronizáciu.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>Otvoriť v prehliadači</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>Odhlásiť</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>Nedávne zmeny</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>Spravované priečinky:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>Otvoriť priečinok &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>Otvoriť %1 v prehliadači</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>Neznámy stav</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>Pomoc</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>Ukončiť %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation>Odpojený od %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation>Nepodporovaná verzia servera</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>Server na účte %1  používa starú a nepodporovanú verziu %2. Používanie tohto klienta s nepodporovanými verziami servera nie je testované a môže byť nebezpečné. Pokračujte len na vlastné riziko.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>Odpojený</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation>Odpojené od niektorých účtov</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>Odpojené od účtov:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>Účet %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>Odhlásený</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>Synchronizácia účtu je vypnutá</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>Synchronizácia je pozastavená</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation>Nevyriešené konflikty</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>Chyba počas synchronizácie</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation>Nie sú nastavené žiadne synchronizačné priečinky</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation>Znovu spustiť všetky priečinky</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>Pozastaviť všetky priečinky</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation>Prihlásiť sa...</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation>Pokračovať vo všetkých synchronizáciách</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation>Pokračovať v synchronizácii</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>Pozastaviť všetku synchronizáciu</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>Pozastaviť synchronizáciu</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Synchronizuje sa %1 z %2 (zostáva %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation>Zlyhanie</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation>Apky</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation>Nastavenia...</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation>Nový účet...</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation>Zobraziť ďalšiu aktivitu...</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>Žiadne nedávno synchronizované položky</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation>Kontrolujú sa zmeny vo vzdialenom &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation>Kontrolujú sa zmeny v lokálnom &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation>Synchronizuje sa %1 z %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>Synchronizuje sa %1 (zostáva %2)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>Synchronizuje sa %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>Až do dnešného dňa</translation>
</message>
@@ -4005,7 +3852,7 @@ Nie je vhodné ju používať.</translation>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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 d78f6d3b4..15acd5adb 100644
--- a/translations/client_sl.ts
+++ b/translations/client_sl.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>Prostor: ...</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>Prekliči</translation>
</message>
@@ -242,230 +242,199 @@
<translation>Vzpostavljena je povezava s strežnikom &lt;server&gt; kot &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>Ni nastavljenega računa.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>Dodaj nov račun</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>Odstrani račun</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>Račun</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation>Omogoči šifriranje</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation>Šifriraj</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation>Uredi neusklajevane datoteke</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>Izbor predmetov za usklajevanje</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>Vsili takojšnje usklajevanje</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>Ponovno zaženi usklajevanje</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>Odstrani povezavo za usklajevanje mape</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>Ustvarjanje mape je spodletelo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Potrdi odstranjevanje povezave usklajevanja mape</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>Odstrani povezavo za usklajevanje mape</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>Usklajevanje je v teku</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Izvaja se usklajevanje.&lt;br/&gt;Ali želite opravilo prekiniti?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>Skupna velikost je %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 kot &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>Različica strežnika %1 je zastarela in ni več podprta! Nadaljujete na lastno odgovornost.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>Vzpostavljena je povezava s strežnikom %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Strežnik %1 trenutno ni dosegljiv.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Strežnik %1 je trenutno v načinu vzdrževanja.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>Uspešno odjavljeno iz %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Poteka pridobitev overitve prek brskalnika. &lt;a href=&apos;%1&apos;&gt;Kliknite&lt;/a&gt; to za ponovno odpiranje brskalnika.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>S strežnikom %1 ni vzpostavljene povezave (%2).</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>Prijava</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Zaznane so mape, ki zaradi omejitve velikosti niso bile usklajene: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Zaznane so mape, ki zaradi pripadnosti zunanji shrambi niso bile usklajene: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Zaznane so mape, ki zaradi omejitve velikosti ali pripadnosti zunanji shrambi niso bile usklajene: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Potrdi odstranjevanje računa</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<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/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>Odstrani povezavo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>Odpri mapo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>Odjavi račun</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>Nadaljuj z usklajevanjem</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>Premor usklajevanja</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Ali res želite zaustaviti usklajevanje mape &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Opomba:&lt;/b&gt; s tem datoteke iz odjemalca &lt;b&gt;ne bodo&lt;/b&gt; odstranjene.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) od %2 v uporabi. Nekatere mape, vključno s priklopljenimi mapami in mapami v souporabi, imajo morda različne omejitve.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>%1 od %2 v uporabi</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>Trenutno ni na voljo nobenih podatkov o porabi prostora.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>Ni nastavljene povezave %1.</translation>
</message>
@@ -473,103 +442,62 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>Odjavljeno</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>Brez povezave</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>Povezano</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>Storitev ni na voljo</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>Vzdrževalni način</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>Omrežna napaka</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>Napaka nastavitve</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>Zahteva po poverilih</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>Neznano stanje računa</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation>Več podrobnosti</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation>Sprejmi</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation>Odpri brskalnik</translation>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation>Sprejmi</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
- <translation>Usklajeno</translation>
- </message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation>Ponovi vsa nalaganja</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br/&gt;Za račun %1 možnosti opravil niso omogočene.</translation>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -680,12 +608,12 @@
<translation>Ni nastavljenega računa v oblaku ownCloud</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>Nastavljen strežnik tega odjemalca je prestar.</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Posodobite strežnik in ponovno zaženite odjemalca.</translation>
</message>
@@ -901,36 +829,36 @@
<translation>Ni mogoče prebrati sistemske izločitvene datoteke</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Dodana je nova mapa, ki presega %1 MB: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>Dodana je mapa iz zunanje shrambe.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Med nastavitvami jo lahko izberete in označite za prejem.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -939,7 +867,7 @@ This means that the synchronization client might not upload local changes immedi
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -947,29 +875,29 @@ If you decide to delete the files, they will be unavailable to you, unless you a
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation>Ali želite izbrisati vse datoteke?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation>Izbriši vse datoteke</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation>Obnovi izbrisane datoteke</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -978,17 +906,17 @@ To se lahko zgodi, če je na strežniku na primer obnovljena varnostna kopija.
Z nadaljevanjem usklajevanja bodo vse trenutne datoteke prepisane s starejšimi različicami. Ali želite ohraniti trenutne krajevne datoteke kot preimenovane datoteke v usklajevalnem sporu?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>Zaznana je shranjena varnostna kopija</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>Običajno usklajevanje</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>Ohrani krajevne datoteke kot datoteke v sporu</translation>
</message>
@@ -1475,22 +1403,22 @@ Z nadaljevanjem usklajevanja bodo vse trenutne datoteke prepisane s starejšimi
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation>Napaka souporabe</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2624,7 +2552,7 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>Opusti</translation>
</message>
@@ -2637,22 +2565,17 @@ Uporaba ni priporočljiva.</translation>
<translation>Nastavitve</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>Dejavnosti</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>Splošno</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>Omrežje</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>Račun</translation>
</message>
@@ -2898,60 +2821,54 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation>Omogoči souporabo z %1</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation>Možnosti souporabe</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation>Kopiraj zasebno povezavo v odložišče</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation>Kopiraj javno povezavo</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation>Kopiraj krajevno povezavo</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation>Odpri v brskalniku</translation>
</message>
@@ -3438,7 +3355,7 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3446,17 +3363,68 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<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>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3493,234 +3461,113 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>Pred nadaljevanjem je zahtevana prijava</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>Mapa %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>Ni nastavljenih map za usklajevanje.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>Odpri v brskalniku</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>Odjava</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>Nedavne spremembe</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>Upravljane mape:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>Odpri mapo &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>Odpri %1 v brskalniku</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>Neznano stanje</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>Pomoč</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>Končaj %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation>Prekinjena povezava z %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation>Nepodprta različica strežnika</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>Na strežniku računua %1 teče starejša nepodprta različica %2. Z uporabo trenutno nameščenega odjemalca z nepodporo različico strežnika ni varno. Nadaljujete na lastno odgovornost.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>Brez povezave</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>Prekinjena je povezava z računi:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>Račun %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>Odjavljeno</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>Usklajevanje računa je onemogočeno</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>Usklajevanje je v premoru</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation>Nerazrešeni spori</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>Napaka med usklajevanjem</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation>Ni nastavljenih map za usklajevanje</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation>Nadaljuj z usklajevanjem vseh map</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>Ustavi usklajevanje vseh map</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation>Nadaljuj z vsemi usklajevanji</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation>Nadaljuj z usklajevanjem</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>Ustavi vse usklajevanje</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>Ustavi usklajevanje</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation>Sesuj zdaj</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation>Programi</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>Ni nedavno usklajenih predmetov</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation>Poteka usklajevanje %1 od %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>Usklajevanje %1 (%2 do konca)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>Usklajevanje %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>Ni posodobitev</translation>
</message>
@@ -3992,7 +3839,7 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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_sr.ts b/translations/client_sr.ts
index 9f5c23a5b..3724785db 100644
--- a/translations/client_sr.ts
+++ b/translations/client_sr.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>Простор у складишту: ...</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>Одустани</translation>
</message>
@@ -242,230 +242,199 @@
<translation>Повезан са &lt;server&gt; као &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>Није подешен налог.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>Додај нови</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>Уклони</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>Налог</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation>Овај налог подржава шифровање са краја на крај</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation>Укључи шифровање</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation>Прикажи E2E мнемоник</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation>Шифруј</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation>Измени игнорисане фајлове</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>Изаберите шта синхронизовати</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>Форсирај синхронизацију сада</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>Поново покрени синхронизацију</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>Уклони везу на синхронизацију фасцикле</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>Прављење фасцикле није успело</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Потврдите уклањање конекције на синхронизацију фасцикле</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>Уклони везу на синхронизацију фасцикле</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>Синхронизација у току</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Синхронизација је у току.&lt;br/&gt;Желите ли да је прекинете?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 искоришћено</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 као &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>Верзија сервера %1 је стара и није подржана! Настављате на сопствену одговорност.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>Повезан са %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Сервер %1 је привремено недоступан.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Сервер %1 је тренутно у режиму одржавања.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>Одјављен са %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Дохватам ауторизацију из веб читача. &lt;a href=&apos;%1&apos;&gt;Кликните овде&lt;/a&gt; да поново отворите веб читач.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>Нема конекције на %1 са %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>Пријава</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Ово су фасцикле које нису синхронизоване јер су превелике:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Ово су фасцикле које нису синхронизоване зато што су на спољним складиштима:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Ово су фасцикле које нису синхронизоване зато што су превелике или су на спољним складиштима:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Потврда уклањања налога</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Да ли стварно желите да уклоните везу ка налогу &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Белешка:&lt;/b&gt; Овим &lt;b&gt;нећете&lt;/b&gt;обрисати ниједан фајл.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>Уклони везу</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>Отвори фасциклу</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>Одјава</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>Настави синхронизацију</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>Паузирај синхронизацију</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;Не могу да направим локалну фасциклу &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Желите ли заиста да престанете са синхронизацијом фасцикле &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Напомена:&lt;/b&gt; Ово &lt;b&gt;неће&lt;/b&gt; обрисати ниједан фајл.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) од %2 искоришћено. Неке фасцикле, укључујући мрежно монтиране или дељене фасцикле, могу имати друга ограничења.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>%1% од %2 искоришћено</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>Тренутно нема доступних података о заузећу складишта.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation>Повезујем се на %1 …</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>Нема подешене %1 везе.</translation>
</message>
@@ -473,103 +442,62 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>Одјављен</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>Неповезан</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>Повезан</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>Услуга није доступна</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>Режим одржавања</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>Грешка мреже</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>Грешка подешавања</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>Питам за акредитиве</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>Непознато стање налога</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation>Више информација</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation>Прихвати</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation>Придружи се</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation>Отвори веб читач</translation>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation>Фајлови са списка за игнорисање као и симболичке везе нису синхронизовани. Ово укључује:</translation>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation>Прихвати</translation>
- </message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
- <translation>Синхронизовано</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation>Понови сва отпремања</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br/&gt;Налог %1 нема укључене активности.</translation>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -680,12 +608,12 @@
<translation>Нема подешеног оунКлауд налога</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>Подешени сервер је сувише стар за ову верзију клијента</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Ажурирајте сервер и поново покрените клијента.</translation>
</message>
@@ -901,36 +829,36 @@
<translation>Не могу да прочитам системски списак за игнорисање</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Додата је нова фасцикла већа од %1 MB: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>Додата је фасцикла са спољног складишта.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Идите у поставке и означите ако желите да ја преузмете.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Фасцикла %1 је креирана, али је још раније искључена из синхронизације. Подаци унутар ње неће бити синхронизовани.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Фајл %1 је креиран, али је још раније искључен из синхронизације. Неће бити синхронизован.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -943,7 +871,7 @@ This means that the synchronization client might not upload local changes immedi
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -954,7 +882,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a
Ако одлучите да обришете фајлове, они ће Вам постати недоступни, осим ако нисте власник.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
@@ -963,22 +891,22 @@ If this action was unintended you can restore the lost data now.</source>
Уколико ово није била намера, можете сада повратити све обрисане податке.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation>Избриши све фајлове?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation>Избриши све фајлове</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation>Поврати избрисане фајлове</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -987,17 +915,17 @@ Continuing the sync as normal will cause all your files to be overwritten by an
Ако наставите синхронизацију, сви Ваши фајлови ће бити преписани са старијим фајловима из старијег стања. Да ли желите да задржите Ваше најскорије локалне фајлове као конфликтне фајлове?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>Детектован бекап</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>Нормална синхронизација</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>Чувај локалне фајлове као конфликтне</translation>
</message>
@@ -1484,22 +1412,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation>Грешка приликом дељења</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2637,7 +2565,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>Откажи</translation>
</message>
@@ -2650,22 +2578,17 @@ It is not advisable to use it.</source>
<translation>Поставке</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>Активност</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>Опште</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>Мрежа</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>Налог</translation>
</message>
@@ -2911,60 +2834,54 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation>Подели са %1</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation>Контекстни мени дељења</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation>Поделио сам нешто са Вама</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation>Опције дељења</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation>Подели преко %1</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation>Пошаљи приватну везу е-поштом…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation>Копирај приватну везу у оставу</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation>Поновно дељење није дозвољено</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation>Копирај јавну везу</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation>Копирај интерну везу</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation>Отвори у веб читачу</translation>
</message>
@@ -3451,7 +3368,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3459,17 +3376,68 @@ It is not advisable to use it.</source>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>&lt;p&gt;Ово издање је обезбедио %1&lt;/p&gt;</translation>
</message>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3506,234 +3474,113 @@ It is not advisable to use it.</source>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>Пријавите се</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>Фасцикла %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>Нема подешених фасцикли за синхронизацију.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>Отвори у прегледачу</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>Одјава</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>Недавне измене</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>Управљане фасцикле:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>Отвори фасциклу „%1“</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>Отвори %1 у прегледачу</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>Непознато стање</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>Помоћ</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>Напусти %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation>Одјављен са %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation>Неподржана верзија сервера</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>Сервер на налогу %1 ради са старом и неподржаном верзијом %2. Коришћење овог клијента са неподржаном серверском верзијом није тестирано и може потенцијално бити опасно. Настављате на сопствену одговорност.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>Неповезан</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation>Изгубљена веза за неке налоге</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>Одјављен са налога:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>Налог %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>Одјављен</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>Синхронизација налога је искључена</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>Синхронизација је паузирана</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation>Неразрешени конфликти</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>Грешка приликом синхронизације</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation>Нису подешене фасцикле за синхронизацију</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation>Настави за све фасцикле</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>Паузирај за све фасцикле</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation>Пријава…</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation>Настави сву синхронизацију</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation>Настави синхронизацију</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>Паузирај сву синхронизацију</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>Паузирај синхронизацију</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Синхронизујем %1 од %2 (преостало %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation>Падни сада</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation>Апликације</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation>Поставке…</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation>Нови налог…</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation>Види још активности…</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>Ништа није недавно синхронизовано</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation>Проверавам за измене у удаљеној &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation>Проверавам за измене у локалној &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation>Синхронизујем %1 од %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>Синхронизујем %1 (преостало %2)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>Синхронизујем %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>Ажурно</translation>
</message>
@@ -4005,7 +3852,7 @@ It is not advisable to use it.</source>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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 583a2e085..df2d3906c 100644
--- a/translations/client_sv.ts
+++ b/translations/client_sv.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>Lagringsutrymme: ...</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>Avbryt</translation>
</message>
@@ -242,230 +242,199 @@
<translation>Ansluten till &lt;server&gt; som &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>Inget konto är konfigurerat.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>Lägg till ny</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>Radera</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>Konto</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation>Detta konto stödjer ändpunkt-till-ändpunkt-kryptering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation>Aktivera kryptering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation>Visa E2E krypteringsord</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation>Kryptera</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation>Redigera ignorerade filer</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>Välj vad som ska synkroniseras</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>Tvinga synkronisering nu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>Starta om synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>Ta bort anslutning till mappsynkronisering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>Kunde inte skapa mappen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Bekräfta radering av anslutning till mappsynkronisering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>Ta bort anslutning till mappsynkronisering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>Synkronisering pågår</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>En synkronisering pågår.&lt;br/&gt;Vill du avbryta den?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 används</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 som &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>Serverversion %1 är gammal och stöds inte längre! Fortsätt på egen risk.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>Ansluten till %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Servern %1 är för tillfället inte tillgänglig.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Servern %1 är för närvarande i underhållsläge.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>Utloggad från %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Anskaffar autentisering från webbläsaren. &lt;a href=&apos;%1&apos;&gt;Klicka här &lt;/a&gt; för att öppna webbläsaren igen.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>Ingen anslutning till %1 vid %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>Logga in</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Dessa mappar har inte synkroniserats för att de är för stora:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Det finns mappar som inte synkroniserats för att de är externa lagringsytor:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Det finns mappar som inte blivit synkroniserade på grund av att de är för stora eller är externa lagringsytor: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Bekräfta radering an kontot</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Vill du verkligen avsluta anslutningen till kontot &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Observera:&lt;/b&gt; Detta kommer &lt;b&gt;inte&lt;/b&gt; radera några filer.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>Radera anslutning</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>Öppna mapp</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>Logga ut</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>Återuppta synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>Pausa synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;Kunde inte skapa lokal mapp &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Vill du verkligen avbryta synkronisering av mappen &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Observera:&lt;/b&gt; Detta kommer &lt;b&gt;inte&lt;/b&gt; radera några filer.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) av %2 används. Vissa mappar, inklusive nätverks- eller delade mappar, kan ha andra begränsningar.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>%1 av %2 används</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>Just nu finns ingen utrymmes information tillgänglig</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation>Ansluter till %1 …</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>Ingen %1 anslutning konfigurerad.</translation>
</message>
@@ -473,103 +442,62 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>Utloggad</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>Bortkopplad</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>Ansluten</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>Tjänsten är inte tillgänglig</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>Underhållsläge</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>Nätverksfel</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>Konfigurationsfel</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>Frågar efter inloggningsuppgifter</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>Okänd kontostatus</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation>Mer information</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation>Acceptera</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation>Gå med</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation>Öppna webbläsare</translation>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation>Filer från ignorerings-listan och symboliska länkar synkroniseras inte. Detta inkluderar:</translation>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation>Acceptera</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
- <translation>Synkroniserad</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation>Försök ladda upp igen</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br/&gt;Kontot %1 har inte aktiviteter aktiverade</translation>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -680,12 +608,12 @@
<translation>Inget ownCloud konto konfigurerat</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>Den konfigurerade servern är för den här klienten är för gammal</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Vänligen uppdatera till den senaste servern och starta om klienten.</translation>
</message>
@@ -901,36 +829,36 @@
<translation>Kunde inte läsa systemets exkluderings-fil</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>En ny mapp större än %1 MB har lagts till: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>En mapp från en extern lagringsyta har lagts till.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Vänligen gå till inställningar och välj den om du önskar att hämta den.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Mappen %1 skapades men var tidigare exkluderad från synkronisering. Data i denna mapp kommer inte att synkroniseras.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Filen %1 skapades men var tidigare exkluderad från synkronisering. Den kommer inte att synkroniseras.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -943,7 +871,7 @@ Det betyder att synkroniseringsklienten inte kan ladda upp lokala ändringar ome
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -954,7 +882,7 @@ Om du återställer dessa filer kommer dom att synkroniseras till servern på ny
Om du raderar filerna kommer dom att vara otillgängliga för dig, om du inte är ägaren.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
@@ -963,22 +891,22 @@ Dessa filer kommer att tas bort från servern och kommer inte att vara tillgäng
Om denna åtgärd var oavsiktlig kan du återställa förlorade data nu.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation>Radera alla filer?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation>Radera alla filer</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation>Återställ raderade filer</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -987,17 +915,17 @@ Detta kan vara för att en säkerhetskopia har återställts på servern.
Om du fortsätter synkroniseringen kommer alla dina filer återställas med en äldre version av filen. Vill du behålla dina nyare lokala filer som konfliktfiler?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>Backup upptäckt</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>Normal synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>Behåll lokala filer som konflikt</translation>
</message>
@@ -1484,22 +1412,22 @@ Om du fortsätter synkroniseringen kommer alla dina filer återställas med en
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation>Lösenord för delning krävs</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<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/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation>Fel vid delning</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2637,7 +2565,7 @@ Det är inte lämpligt att använda den.</translation>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>Avfärda</translation>
</message>
@@ -2650,22 +2578,17 @@ Det är inte lämpligt att använda den.</translation>
<translation>Inställningar</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>Aktivitet</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>Allmänt</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>Nätverk</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>Konto</translation>
</message>
@@ -2911,60 +2834,54 @@ Det är inte lämpligt att använda den.</translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation>Dela med %1</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation>Delningsmeny</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation>Jag delade något med dig</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation>Delningsalternativ</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation>Dela via %1</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation>Skicka privat länk med e-post ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation>Kopiera privat länk till urklipp</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<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.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation>Kopiera publik länk</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation>Kopiera intern länk</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation>Öppna i webbläsare</translation>
</message>
@@ -3451,7 +3368,7 @@ Det är inte lämpligt att använda den.</translation>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3459,17 +3376,68 @@ Det är inte lämpligt att använda den.</translation>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<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>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3506,234 +3474,113 @@ Det är inte lämpligt att använda den.</translation>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>Vänliga logga in</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>Mapp %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>Det finns inga synkroniseringsmappar konfigurerade.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>Öppna i webbläsare</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>Logga ut</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>Senaste ändringar</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>Hanterade mappar:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>Öppna mapp &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>Öppna %1 i webbläsaren</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>Okänd status</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>Hjälp</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>Avsluta %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation>Koppla från %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation>Serverversion stöds inte</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>Servern på konto %1 kör en gammal version %2 som inte längre stöds. Att använda den här klienten med den serverversionen är otestat och potentiellt farligt. Fortsätt på egen risk.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>Bortkopplad</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation>Nedkopplad från vissa konton</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>Bortkopplad från dessa konton:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>Konto %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>Utloggad</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>Synkronisering för konto är avstängd</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>Synkroniseringen är pausad</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation>Olösta konflikter.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>Fel vid synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation>Inga mappar valda för synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation>Återuppta alla mappar</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>Pausa alla mappar</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation>Logga in ...</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation>Återuppta all synkronisering</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation>Återuppta synkronisering</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>Pausa all synkronisering</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>Pausa synkronisering</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Synkroniserar %1 av %2 (%3 kvar)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation>Krascha nu</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation>Appar</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation>Inställningar ...</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation>Nytt konto ...</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation>Visa mer aktivitet ...</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>Inga filer har synkroniseras nyligen</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation>Söker efter ändringar i fjärrmappen &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation>Söker efter ändringar i lokal mapp &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation>Synkroniserar %1 av %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>Synkroniserar %1 (%2 kvar)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>Synkroniserar %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>Aktuell version</translation>
</message>
@@ -4005,7 +3852,7 @@ Det är inte lämpligt att använda den.</translation>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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 714e777b0..4723df5e6 100644
--- a/translations/client_th.ts
+++ b/translations/client_th.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>พื้นที่จัดเก็บข้อมูล: ...</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>ยกเลิก</translation>
</message>
@@ -242,230 +242,199 @@
<translation>เชื่อมต่อกับ &lt;server&gt; ด้วยผู้ใช้ &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>ไม่มีการกำหนดค่าบัญชี</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>เพิ่มใหม่</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>ลบออก</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>บัญชี</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation>เปิดใช้งานการเข้ารหัส</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation>เข้ารหัส</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>เลือกข้อมูลที่ต้องการประสาน</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>บังคับประสานข้อมูลเดี๋ยวนี้</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>ประสานข้อมูลอีกครั้ง</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>ลบโฟลเดอร์ที่ประสานข้อมูลออก</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>สร้างโฟลเดอร์ล้มเหลว</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>ยืนยันการลบโฟลเดอร์ที่ประสานข้อมูลออก</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>ลบโฟลเดอร์ที่ประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>กำลังประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>กำลังดำเนินการประสานข้อมูลอยู่ &lt;br/&gt;คุณต้องการสิ้นสุดการทำงาน?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 กำลังถูกใช้งาน</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 เช่น &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>เซิร์ฟเวอร์เวอร์ชัน %1 เป็นรุ่นเก่าและไม่ได้รับการสนับสนุน! ดำเนินการความเสี่ยงด้วยคุณเอง</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>เชื่อมต่อกับ %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>เซิร์ฟเวอร์ %1 ไม่สามารถใช้ได้ชั่วคราว</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>เซิร์ฟเวอร์ %1 กำลังอยู่ในโหมดการบำรุงรักษา</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>ลงชื่อออกจาก %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>กำลังได้รับอนุญาตจากเบราเซอร์ &lt;a href=&apos;%1&apos;&gt;คลิกที่นี่&lt;/a&gt; เพื่อเปิดเบราเซอร์อีกครั้ง</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>ไม่มีการเชื่อมต่อไปยัง %1 ที่ %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>เข้าสู่ระบบ</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>บางโฟลเดอร์จะไม่ถูกประสานข้อมูลเพราะขนาดของมันใหญ่เกินไป:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>มีบางโฟลเดอร์จะไม่ถูกประสานข้อมูลเพราะเป็นพื้นที่จัดเก็บข้อมูลภายนอก</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>มีบางโฟลเดอร์จะไม่ถูกประสานข้อมูลเพราะเป็นพื้นที่จัดเก็บข้อมูลภายนอกหรือมีขนาดที่ใหญ่เกินไป</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>ยืนยันการลบบัญชี</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;คุณต้องการลบการเชื่อมต่อกับบัญชี&lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;หมายเหตุ:&lt;/b&gt; นี้จะ &lt;b&gt;ไม่&lt;/b&gt; ลบไฟล์ใดๆ&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>ลบการเชื่อมต่อ</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>เปิดโฟลเดอร์</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>ออกจากระบบ</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>ประสานข้อมูลอีกครั้ง</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>หยุดประสานข้อมูลชั่วคราว</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;คุณต้องการที่จะหยุดการประสานข้อมูลโฟลเดอร์&lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;หมายเหตุ:&lt;/b&gt; นี้จะ &lt;b&gt;ไม่&lt;/b&gt; ลบไฟล์ใดๆ&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>มีการใช้งาน %1 (%3%) จาก %2 บางโฟลเดอร์รวมทั้งเครือข่ายที่ติดตั้งหรือโฟลเดอร์ที่แชร์อาจมีข้อจำกัดที่แตกต่างกัน</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>มีการใช้งาน %1 จาก %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>ขณะนี้ไม่มีพื้นที่จัดเก็บข้อมูลที่ใช้งานได้</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>ไม่มีการเชื่อมต่อ %1 ที่ถูกกำหนดค่า</translation>
</message>
@@ -473,104 +442,63 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>ออกจากระบบ</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>ยกเลิกการเชื่อมต่อ</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>เชื่อมต่อ</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>ไม่สามารถให้บริการได้</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>โหมดบำรุงรักษา</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>ข้อผิดพลาดของเครือข่าย</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>กำหนดค่าผิดพลาด</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>กำลังขอข้อมูลการรับรอง</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>ไม่ระบุสถานะบัญชี</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation type="unfinished"/>
- </message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br /&gt;บัญชี %1 ไม่มีกิจกรรมที่เปิดใช้งาน</translation>
- </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
@@ -680,12 +608,12 @@
<translation>ไม่มีการกำหนดค่าบัญชี ownCloud </translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>การกำหนดค่าเซิร์ฟเวอร์สำหรับไคลเอ็นต์นี้เก่าเกินไป</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>กรุณาอัพเดทเซิร์ฟเวอร์ใหม่ใหม่ที่สุดและรีสตาร์ทไคลเอนต์</translation>
</message>
@@ -901,36 +829,36 @@
<translation>ไม่สามารถอ่าน ยกเว้นไฟล์ระบบ</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>โฟลเดอร์ใหม่มีขนาดใหญ่กว่า %1 เมกะไบต์ ได้ถูกเพิ่ม: %2
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>โฟลเดอร์ที่มีพื้นที่จัดเก็บข้อมูลภายนอกได้ถูกเพิ่ม
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>กรุณาไปในส่วนของการตั้งค่าเพื่อเลือก ถ้าคุณต้องการจะดาวน์โหลด</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -939,7 +867,7 @@ This means that the synchronization client might not upload local changes immedi
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -947,29 +875,29 @@ If you decide to delete the files, they will be unavailable to you, unless you a
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -978,17 +906,17 @@ Continuing the sync as normal will cause all your files to be overwritten by an
ไฟล์ปัจจุบันของคุณทั้งหมดจะถูกเขียนทับด้วยไฟล์เก่า คุณต้องการเก็บไฟล์ไว้?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>ตรวจพบการสำรองข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>ประสานข้อมูลปกติ</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>เก็บไฟล์ต้นทางเป็นไฟล์ที่มีปัญหา</translation>
</message>
@@ -1475,22 +1403,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2621,7 +2549,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>ยกเลิก</translation>
</message>
@@ -2634,22 +2562,17 @@ It is not advisable to use it.</source>
<translation>ตั้งค่า</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>กิจกรรม</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>ทั่วไป</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>เครือข่าย</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>บัญชี</translation>
</message>
@@ -2895,60 +2818,54 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation>ฉันแชร์บางอย่างกับคุณ</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation>คัดลอกลิงค์ส่วนตัวไปยังคลิปบอร์ด</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation type="unfinished"/>
</message>
@@ -3434,7 +3351,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3442,17 +3359,68 @@ It is not advisable to use it.</source>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3489,234 +3457,113 @@ It is not advisable to use it.</source>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>กรุณาเข้าสู่ระบบ</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>โฟลเดอร์ %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>ไม่มีการกำหนดค่าการประสานข้อมูลโฟลเดอร์</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>เปิดในเบราว์เซอร์</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>ออกจากระบบ</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>การเปลี่ยนแปลงล่าสุด</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>โฟลเดอร์ที่มีการจัดการแล้ว:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>เปิดโฟลเดอร์ &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>เปิด %1 ในเบราว์เซอร์</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>สถานะที่ไม่รู้จัก</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>ช่วยเหลือ</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>ออก %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation>ถูกตัดการเชื่อมต่อจาก %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation>ไม่สนับสนุนรุ่นของ Server</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>เซิฟเวอร์บนบัญชี %1 ได้ใช้งานในรุ่นเก่าและเป็นรุ่นที่ไม่ได้รับการสนับสนุนแล้ว %2 หากใช้งานต่อไปอาจเป็นอันตราย ดำเนินการที่มีความเสี่ยงด้วยตัวคุณเอง</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>ยกเลิกการเชื่อมต่อ</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation>ยกเลิกการเชื่อมต่อจากบางบัญชี</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>ยกเลิกการเชื่อมต่อจากบัญชี:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>บัญชี %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>ออกจากระบบ</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>บัญชีประสานข้อมูลถูกปิดใช้งาน</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>หยุดการประสานข้อมูลแล้ว</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>เกิดข้อผิดพลาดขณะทำการประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation>ไม่ได้กำหนดค่าโฟลเดอร์ที่จะประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>หยุดโฟลเดอร์ทั้งหมดชั่วคราว</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>หยุดการประสานข้อมูลทั้งหมดชั่วคราว</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>หยุดการประสานข้อมูลชั่วคราว</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation>ความผิดพลาดในขณะนี้</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>ไม่มีรายการที่ถูกประสานข้อมูลเมื่อเร็วๆ นี้</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation>กำลังประสานข้อมูล %1 จากทั้งหมด %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>กำลังประสานข้อมูล %1 (เหลือ %2)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>กำลังประสานข้อมูล %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>ถึงวันที่</translation>
</message>
@@ -3988,7 +3835,7 @@ It is not advisable to use it.</source>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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 642d9affe..35da71d56 100644
--- a/translations/client_tr.ts
+++ b/translations/client_tr.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>Depolama alanı: ...</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>İptal</translation>
</message>
@@ -242,230 +242,199 @@
<translation>&lt;server&gt; ile &lt;user&gt; olarak bağlantı kuruldu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>Herhangi bir hesap yapılandırılmamış.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>Yeni ekle</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>Sil</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>Hesap</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation>Bu hesap uçtan uca şifrelemeyi destekliyor</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation>Şifreleme kullanılsın</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation>Uçtan uca şifreleme anımsatıcı görüntülensin:</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation>Şifrele</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation>Yok Sayılan Dosyaları Düzenle</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>Eşitlenecek ögeleri seçin</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>Şimdi eşitlemeye zorla</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>Eşitlemeyi yeniden başlat</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>Klasör eşitleme bağlantısını sil</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>Klasör oluşturulamadı</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Klasör Eşitleme Bağlantısını Silmeyi Onaylayın</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>Klasör Eşitleme Bağlantısını Sil</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>Eşitleme Çalışıyor</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Eşitleme işlemi sürüyor.&lt;br/&gt;Durdurmak istiyor musunuz?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 kullanılıyor</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 &lt;i&gt;%2&lt;/i&gt; olarak</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>%1 sunucu sürümü eski ve desteklenmiyor! Riski üstlenerek devam edebilirsiniz.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>%1 ile bağlı.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>%1 sunucusu geçici olarak kullanılamıyor.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>%1 sunucusu bakım kipinde.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>%1 oturumu kapatıldı.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Kimlik web tarayıcısı üzerinden doğrulanıyor. Web tarayıcıyı yeniden açmak için &lt;a href=&apos;%1&apos;&gt;buraya tıklayın&lt;/a&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>%1 ile %2 üzerinde bağlantı yok.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>Oturum Aç</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Çok büyük oldukları için eşitlenmeyen klasörler var:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Dış depolama alanlarında bulundukları için eşitlenmeyen klasörler var:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Çok büyük oldukları için ya da dış depolama alanında bulundukları için eşitlenmeyen klasörler var:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Hesap Silmeyi Onaylayın</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<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ı kaldırmayı 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/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>Bağlantıyı kaldır</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>Klasörü aç</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>Oturumu Kapat</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>Eşitlemeyi sürdür</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>Eşitlemeyi duraklat</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;i&gt;%1&lt;/i&gt; yerel klasörü oluşturulamadı.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Gerçekten &lt;i&gt;%1&lt;/i&gt; klasörünün eşitlemesini durdurmayı 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/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) / %2 kullanımda. Ağ üzerinden bağlanmış ya da paylaşılmış klasörlerin sınırları farklı olabilir.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>%1 / %2 kullanılıyor</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>Şu anda depolama kullanımı ile ilgili bir bilgi yok.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation>%1 bağlantısı kuruluyor …</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>Henüz bir %1 bağlantısı yapılandırılmamış.</translation>
</message>
@@ -473,103 +442,62 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>Oturum kapatıldı</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>Bağlantı kesildi</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>Bağlandı</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>Hizmet kullanılamıyor</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>Bakım kipi</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>Ağ sorunu</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>Yapılandırma sorunu</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>Kimlik Doğrulama Bilgileri Soruluyor</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>Hesap durumu bilinmiyor</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation>Ayrıntılı bilgi alın</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation>Kabul Et</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation>Katıl</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation>Tarayıcıyı Aç</translation>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation>Yok sayma listesindeki dosyalar ve sembolik bağlantılar eşitlenmez. Şunlar bulunur:</translation>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation>Kabul Et</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
- <translation>Eşitlenmiş</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation>Tüm yüklemeleri yinele</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br/&gt;%1 hesabının etkinleştirilmiş bir işlemi yok.</translation>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -680,12 +608,12 @@
<translation>Herhangi bir ownCloud hesabı yapılandırılmamış</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>Bu istemci için yapılandırılmış sunucu çok eski</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Lütfen sunucuyu en son sürüme güncelleyin ve istemciyi yeniden başlatın.</translation>
</message>
@@ -901,36 +829,36 @@
<translation>Sistem katılmayacaklar dosyası okunamadı</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>%1 MB boyutundan büyük yeni bir klasör eklendi: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>Dış depolama alanından bir klasör eklendi.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>İndirmek istiyorsanız seçmek için lütfen ayarlar bölümüne gidin.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>%1 klasörü oluşturulmuş ancak daha önce eşitleme dışı bırakılmış. Bu klasördeki veriler eşitlenmeyecek.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>%1 dosyası oluşturulmuş ancak daha önce eşitleme dışı bırakılmış. Bu dosyadaki veriler eşitlenmeyecek.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -941,7 +869,7 @@ This means that the synchronization client might not upload local changes immedi
Bunun sonucunda eşitleme istemcisi yerel değişiklikleri anında yükleyemez. Onun yerine yalnız yerel değişiklikleri tarar ve aralıklarla yükler (varsayılan olarak iki saatte bir).</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -952,7 +880,7 @@ Geri yükleme yetkiniz varsa ve geri yüklemeyi seçerseniz, dosyalar sunucu ile
Silmeyi seçerseniz, sahibi değilseniz bu dosyaları artık kullanamazsınız.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
@@ -961,22 +889,22 @@ Bu dosyalar sunucudan da silinecek ve geri yüklenmez ise diğer aygıtlarınız
Bu işlemi kasıtlı olarak yapmıyorsanız şu anda silinen verileri geri geri yükleyebilirsiniz.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation>Tüm dosyalar silinsin mi?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation>Tüm dosyaları sil</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation>Silinmiş dosyaları geri yükle</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -985,17 +913,17 @@ Bunun nedeni sunucuya bir yedeğin geri yüklenmiş olması olabilir.
Eşitlemeye normal şekilde devam edilirse tüm dosyalar daha eski bir dosya ile değiştirilebilir. Çakışma için daha yeni yerel dosyaları korumak ister misiniz?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>Yedek bulundu</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>Normal Eşitleme</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>Çakıştığında Yerel Dosyalar Korunsun</translation>
</message>
@@ -1482,22 +1410,22 @@ Eşitlemeye normal şekilde devam edilirse tüm dosyalar daha eski bir dosya ile
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation>Paylaşım parolası zorunludur</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<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/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation>Paylaşım sorunu</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2635,7 +2563,7 @@ Kullanmanız önerilmez.</translation>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>Yok Say</translation>
</message>
@@ -2648,22 +2576,17 @@ Kullanmanız önerilmez.</translation>
<translation>Ayarlar</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>İşlem</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>Genel</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>Ağ</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>Hesap</translation>
</message>
@@ -2909,60 +2832,54 @@ Kullanmanız önerilmez.</translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation>%1 ile paylaş</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation>Sağ tık menüsü paylaşımı</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation>Sizinle bir şey paylaştım</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation>Paylaşım seçenekleri</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation>%1 ile paylaş</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<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.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation>Özel bağlantıyı panoya kopyala</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation>Bu dosya yeniden paylaşılamaz</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation>Herkese açık bağlantıyı kopyala</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation>İç bağlantıyı kopyala</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation>Tarayıcıda aç</translation>
</message>
@@ -3449,7 +3366,7 @@ Kullanmanız önerilmez.</translation>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3457,17 +3374,68 @@ Kullanmanız önerilmez.</translation>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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;Sürüm %1. 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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<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>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3504,234 +3472,113 @@ Kullanmanız önerilmez.</translation>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>Lütfen oturum açın</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>Klasör %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>Herhangi bir eşitleme klasörü yapılandırılmamış.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>Tarayıcıda aç</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>Oturumu kapat</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>Son Değişiklikler</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>Yönetilen Klasörler:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>&apos;%1&apos; klasörünü aç</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>%1 ögesini tarayıcıda aç</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>Durum bilinmiyor</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>Yardım</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>%1 uygulamasından çık</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation>%1 ile bağlantı kesildi</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation>Sunucu Sürümü Desteklenmiyor</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>%1 hesabındaki sunucu eski ve desteklenmeyen %2 sürümünü kullanıyor. Bu istemci desteklenmeyen sunucu sürümleri üzerinde denenmemiş olduğundan tehlikeli olabilir. Bu riski alıyorsanız devam edebilirsiniz.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>Bağlantı kesildi</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation>Bazı hesapların bağlantısı kesildi</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>Şu hesapların bağlantısı kesildi:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>Hesap %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>Oturum kapatıldı</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>Hesap eşitlemesi devre dışı bırakıldı</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>Eşitleme duraklatıldı</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation>Çözülmemiş çakışmalar</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>Eşitleme sırasında sorun çıktı</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation>Herhangi bir eşitleme klasörü yapılandırılmamış</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation>Tüm klasörleri sürdür</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>Tüm klasörleri duraklat</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation>Oturum aç …</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation>Tüm eşitlemeleri sürdür</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation>Eşitlemeyi sürdür</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>Tüm eşitlemeleri duraklat</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>Eşitlemeyi duraklat</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>%1 / %2 eşitleniyor (%3 kaldı)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation>Şimdi çökert</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation>Uygulamalar</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation>Ayarlar …</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation>Hesap ekle …</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation>Diğer işlemleri görüntüle …</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>Yakın zamanda eşitlenen bir öge yok</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation>Uzak &apos;%1&apos; üzerindeki değişiklikler denetleniyor</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation>Yerel &apos;%1&apos; üzerindeki değişiklikler denetleniyor</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation>%1 / %2 eşitleniyor</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>%1 eşitleniyor (%2 kaldı)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>%1 eşitleniyor</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>Güncel</translation>
</message>
@@ -4003,7 +3850,7 @@ Kullanmanız önerilmez.</translation>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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 97ae23aba..05ce7df99 100644
--- a/translations/client_uk.ts
+++ b/translations/client_uk.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>Простір сховища: ...</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>Скасувати</translation>
</message>
@@ -242,230 +242,199 @@
<translation>Підключено до &lt;server&gt; як &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>Обліковий запис не налаштовано.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>Додати</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>Видалити</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>Обліковий запис</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation>Шифрувати</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>Оберіть, що хочете синхронізувати</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>Примусово синхронізувати зараз</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>Перезапустити синхронізацію</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>Не вдалося створити теку</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>Виконується синхронізація</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Виконується процедура синхронізації.&lt;br/&gt;Бажаєте зупинити?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 використовується</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 як &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>Підключено до %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Сервер %1 тимчасово недоступний.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>Увійти</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>Підтвердіть видалення облікового запису</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>Відкрити теку</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>Вихід</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>Відновити синхронізацію</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>Призупинити синхронізацію</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>Використовується %1 (%3%) з %2. Деякі теки, включаючи мережеві змонтовані чи спільні, можуть мати інші обмеження.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>Використовується %1 з %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>На даний час немає відомостей про наповнення сховища.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>Жодного %1 підключення не налаштовано.</translation>
</message>
@@ -473,102 +442,61 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>Вийшов</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>Від&apos;єднаний</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>З&apos;єднаний</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>Сервіс недоступний</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>Режим обслуговування</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>Помилка мережі</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>Помилка конфігурації</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>Невідомий стан облікового запису</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation>Докладно</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation>Прийняти</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation>Приєднатися</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation>Відкрити бравзер</translation>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation>Прийняти</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
- <translation>Синхронізовано</translation>
- </message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation>Повторно завантажити все</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
</context>
@@ -680,12 +608,12 @@
<translation>Обліковий запис ownCloud не налаштовано</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>Налаштований сервер застарий для цього клієнта</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>Будь ласка, оновіть сервер до останньої версії та перезавантажте клієнт.</translation>
</message>
@@ -901,34 +829,34 @@
<translation>Неможливо прочитати виключений системний файл</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -937,7 +865,7 @@ This means that the synchronization client might not upload local changes immedi
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -945,46 +873,46 @@ If you decide to delete the files, they will be unavailable to you, unless you a
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>Резервну копію знайдено</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@@ -1471,22 +1399,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation>Помилка під час надання доступу</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2617,7 +2545,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>Припинити</translation>
</message>
@@ -2630,22 +2558,17 @@ It is not advisable to use it.</source>
<translation>Налаштування</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>Активність</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>Загалом</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>Мережа</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>Обліковий запис</translation>
</message>
@@ -2891,60 +2814,54 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation>Поділитися з %1</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation>Відкрити у бравзері</translation>
</message>
@@ -3431,7 +3348,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3439,17 +3356,68 @@ It is not advisable to use it.</source>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3486,234 +3454,113 @@ It is not advisable to use it.</source>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>Увійдіть будь ласка</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>Тека %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>Немає налаштованих тек для синхронізації.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>Відкрити у переглядачі</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>Вихід</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>Недавні зміни</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>Керовані теки:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>Відкрити теку &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>Відкрити %1 в браузері</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>Невідомий статус</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>Допомога</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>Закрити %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>Від&apos;єднаний</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>Обліковий запис %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>Вийшов</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>Помилка під час синхронізації</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation>Теки для синхронізації не налаштовано</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation>Продовжити синхронізацію у всіх теках</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>Призупинити синхронізацію всюди</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation>Продовжити синхронізацію всюди</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation>Продовжити синхронізацію</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>Призупинити синхронізацію всюди</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>Призупинити синхронізацію</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation>Критична помилка</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation>Застосунки</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>Нещодавно нічого не синхронізувалося</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>Синхронізовано %1 (залишилося %2)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>Оновлено</translation>
</message>
@@ -3985,7 +3832,7 @@ It is not advisable to use it.</source>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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 4a7b430fb..e9ac53bfd 100644
--- a/translations/client_zh_CN.ts
+++ b/translations/client_zh_CN.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>存储空间:...</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>取消</translation>
</message>
@@ -242,230 +242,199 @@
<translation>与 &lt;server&gt; 连接为 &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>没有配置账号。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>添加</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>移除</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>账号</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation>此账号支持端到端加密</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation>启用加密</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation>显示 E2E 助记词</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation>加密</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation>编辑已忽略的文件</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>选择同步内容</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>立即强制同步</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>重启同步</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>移除文件夹同步连接</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>文件夹创建失败</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>确定移除文件夹同步连接</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>移除文件夹同步连接</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>正在同步</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>同步操作正在进行。&lt;br/&gt;您确定要停止吗?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>已使用 %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1, &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>服务器版本 %1 很旧且不支持,继续操作将自行承担风险。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>已连接到 %1。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>服务器 %1 暂时不可用。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>服务器 %1 目前正在维护。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>从 %1 登出。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>正在从浏览器获得授权。 &lt;a href=&apos;%1&apos;&gt;点击此处&lt;/a&gt; 重新打开浏览器。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>没有到位于%2中的%1的连接</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>登录</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>以下目录由于太大而没有同步:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>以下目录由于是外部存储而没有同步:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>以下目录由于太大或是外部存储而没有同步:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>确认删除账号</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;您确定要删除账号&lt;i&gt;%1&lt;/i&gt;的连接?&lt;/p&gt;&lt;p&gt;&lt;b&gt;注意:&lt;/b&gt; 这 &lt;b&gt;不会&lt;/b&gt; 删除任何文件。&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>删除连接</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>打开文件夹</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>登出</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>恢复同步</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>暂停同步</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation>&lt;p&gt;无法新建本地文件夹 &lt;i&gt;%1&lt;/i&gt;。&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;您确定要停止文件夹&lt;i&gt;%1&lt;/i&gt;同步?&lt;/p&gt;&lt;p&gt;&lt;b&gt;注意:&lt;/b&gt; 这 &lt;b&gt;不会&lt;/b&gt; 删除任何文件。&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) of %2 使用中。一些文件夹,例如网络挂载的和共享的文件夹,可能有不同的限制。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>使用量 %1 / %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>目前没有储存使用量信息可用。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation>正在连接到 %1 …</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>没有 %1 连接配置。</translation>
</message>
@@ -473,103 +442,62 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>已退出</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>连接已断开</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>已连接</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>服务不可用</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>维护模式</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>网络错误</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>配置错误</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>凭证</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>未知的账号状态</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation>更多信息</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation>接受</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation>加入</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation>打开浏览器</translation>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation>来自忽略列表的文件和符号链接不会被同步。这包含:</translation>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation>接受</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
- <translation>已同步</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation>重试所有上传</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br/&gt; 账号 %1 没有同步活动。</translation>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -680,12 +608,12 @@
<translation>没有已经配置的 ownCloud 帐号</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>此客户端连接到的服务器版本过旧</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>请更新到最新的服务器版本然后重启客户端。</translation>
</message>
@@ -901,36 +829,36 @@
<translation>无法读取系统排除的文件</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>一个大于 %1 MB 的新文件夹 %2 已被添加。
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>一个来自外部存储的文件夹已被添加。
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>如果您想下载,请到设置页面选择它。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>文件夹 %1 已创建但之前被排除出同步过程。文件夹中的数据将不会被同步。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>文件 %1 已创建但之前被排除出同步过程。这个文件将不会被同步。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -943,7 +871,7 @@ This means that the synchronization client might not upload local changes immedi
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -954,7 +882,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a
如果您决定删除这些文件,它们将被清空,除非您是文件拥有者。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
@@ -963,22 +891,22 @@ If this action was unintended you can restore the lost data now.</source>
如果此操作不是故意的,您现在就可恢复丢失的数据。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation>删除所有文件?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation>删除所有文件</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation>恢复已删除文件</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -987,17 +915,17 @@ Continuing the sync as normal will cause all your files to be overwritten by an
继续正常同步将导致您全部文件被更早状态的旧文件覆盖。您想要保留冲突文件的本地最新版本吗?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>备份已删除</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>正常同步</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>保留本地文件为冲突文件</translation>
</message>
@@ -1484,22 +1412,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation>需要共享密码</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<source>Please enter a password for your link share:</source>
<translation>请输入您的共享链接密码:</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation>共享错误</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2635,7 +2563,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>忽略</translation>
</message>
@@ -2648,22 +2576,17 @@ It is not advisable to use it.</source>
<translation>设置</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>动态</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>常规</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>网络</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>账号</translation>
</message>
@@ -2909,60 +2832,54 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation>共享给 %1</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation>上下文目录共享</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation>我向您共享了一些东西</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation>共享选项</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation>通过 %1 共享</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation>通过电子邮件发送私人链接…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation>复制私人链接到剪贴板</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation>不允许再次分享此文件</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation>复制公开链接</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation>复制内部链接</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation>在浏览器中打开</translation>
</message>
@@ -3449,7 +3366,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1:%2</translation>
</message>
@@ -3457,17 +3374,68 @@ It is not advisable to use it.</source>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>&lt;p&gt;该版本由 %1 提供&lt;/p&gt;</translation>
</message>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3504,234 +3472,113 @@ It is not advisable to use it.</source>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>请登录</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>文件夹 %1:%2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>没有已配置的同步文件夹。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>在浏览器中打开</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>登出</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>最近修改</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>管理的文件夹:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>打开文件夹“%1”</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>在浏览器中打开%1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>未知状态</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>帮助</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>退出 %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation>已从服务器断开 %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation>不支持的服务器版本</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>账号 %1 的服务器运行着一个古老而不受支持的版本 %2。使用该客户端未支持的服务器版本未经测试并且可能存在潜在危险。继续操作需要自行承担风险。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>连接已断开</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation>已从某些账号断开</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>已断开账号:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>账号 %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>已退出</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>账号同步已禁用</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>同步已暂停</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation>未解决的冲突</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>同步过程中发生错误</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation>没有配置同步目录</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation>恢复所有文件夹</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>暂停所有文件夹</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation>登录 …</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation>恢复所有同步</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation>恢复同步</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>暂停所有同步</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>暂停同步</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>正在同步 %2 的 %1(还剩 %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation>发生了崩溃</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation>应用</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation>设置...</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation>新建账号...</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation>查看更多活动…</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>近期没有项目被同步</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation>检查远程变更 &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation>检查本地变更 &apos;%1&apos;</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation>正在同步 %1,共 %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>同步 %1(剩余 %2)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>正在同步 %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1(%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>更新</translation>
</message>
@@ -4003,7 +3850,7 @@ It is not advisable to use it.</source>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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_TW.ts b/translations/client_zh_TW.ts
index c8696d9ed..a63cee504 100644
--- a/translations/client_zh_TW.ts
+++ b/translations/client_zh_TW.ts
@@ -200,7 +200,7 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="204"/>
<source>Storage space: ...</source>
<translation>儲存空間容量: ...</translation>
</message>
@@ -231,8 +231,8 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="803"/>
- <location filename="../src/gui/accountsettings.cpp" line="1219"/>
+ <location filename="../src/gui/accountsettings.cpp" line="759"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1154"/>
<source>Cancel</source>
<translation>取消</translation>
</message>
@@ -242,230 +242,199 @@
<translation>以 &lt;user&gt; 的身分連接 &lt;server&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="190"/>
+ <location filename="../src/gui/accountsettings.cpp" line="187"/>
<source>No account configured.</source>
<translation>沒有設置帳號。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="220"/>
- <source>Add new</source>
- <translation>新增</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="228"/>
- <source>Remove</source>
- <translation>移除</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="232"/>
- <source>Account</source>
- <translation>帳號</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="242"/>
+ <location filename="../src/gui/accountsettings.cpp" line="216"/>
<source>This account supports end-to-end encryption</source>
<translation>此帳戶支援端點對端點加密</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="244"/>
+ <location filename="../src/gui/accountsettings.cpp" line="218"/>
<source>Enable encryption</source>
<translation>啟用加密</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="261"/>
- <source>Show E2E mnemonic</source>
- <translation>顯示端到端助記碼</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="561"/>
<source>Encrypt</source>
<translation>加密</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="613"/>
- <location filename="../src/gui/accountsettings.cpp" line="649"/>
+ <location filename="../src/gui/accountsettings.cpp" line="569"/>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
<source>Edit Ignored Files</source>
<translation>編輯要忽視的檔案</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="653"/>
+ <location filename="../src/gui/accountsettings.cpp" line="609"/>
<source>Choose what to sync</source>
<translation>選擇要同步的項目</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="659"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
<source>Force sync now</source>
<translation>強制同步</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="661"/>
+ <location filename="../src/gui/accountsettings.cpp" line="617"/>
<source>Restart sync</source>
<translation>重新啟動同步</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="670"/>
+ <location filename="../src/gui/accountsettings.cpp" line="626"/>
<source>Remove folder sync connection</source>
<translation>移除資料夾同步連線</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="741"/>
+ <location filename="../src/gui/accountsettings.cpp" line="697"/>
<source>Folder creation failed</source>
<translation>資料夾建立失敗</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="795"/>
+ <location filename="../src/gui/accountsettings.cpp" line="751"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>確認移除資料夾同步連線</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="802"/>
+ <location filename="../src/gui/accountsettings.cpp" line="758"/>
<source>Remove Folder Sync Connection</source>
<translation>移除資料夾同步連線</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Sync Running</source>
<translation>正在同步中</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="888"/>
+ <location filename="../src/gui/accountsettings.cpp" line="844"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>正在同步中&lt;br/&gt;你真的想要中斷?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="977"/>
+ <location filename="../src/gui/accountsettings.cpp" line="933"/>
<source>%1 in use</source>
<translation>%1 正在使用</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1004"/>
+ <location filename="../src/gui/accountsettings.cpp" line="960"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 如 &lt;i&gt;%2&lt;i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1010"/>
+ <location filename="../src/gui/accountsettings.cpp" line="966"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>伺服器版本%1過舊,已不支援。繼續的風險請自負。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1012"/>
+ <location filename="../src/gui/accountsettings.cpp" line="968"/>
<source>Connected to %1.</source>
<translation>已連線到 %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <location filename="../src/gui/accountsettings.cpp" line="970"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>伺服器 %1 暫時無法使用。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1016"/>
+ <location filename="../src/gui/accountsettings.cpp" line="972"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>伺服器 %1 現正處於維護模式</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1018"/>
+ <location filename="../src/gui/accountsettings.cpp" line="974"/>
<source>Signed out from %1.</source>
<translation>從 %1 登出</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1027"/>
+ <location filename="../src/gui/accountsettings.cpp" line="983"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>正從瀏覽器獲取許可。如須重新開啟瀏覽器,請&lt;a href=&apos;%1&apos;&gt;點擊此處&lt;/a&gt;。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1034"/>
+ <location filename="../src/gui/accountsettings.cpp" line="990"/>
<source>No connection to %1 at %2.</source>
<translation>沒有從 %2 連線到 %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1066"/>
- <source>Log in</source>
- <translation>登入</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="1162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1109"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>有部份的資料夾因為容量太大沒有辦法同步:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1164"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1111"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>有部分資料夾因為是外部存儲沒有辦法同步: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1112"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>有部分資料夾因為容量太大或是外部存儲沒有辦法同步: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1211"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1146"/>
<source>Confirm Account Removal</source>
<translation>確認移除帳號</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1212"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1147"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;您確定要中斷此帳號 &lt;i&gt;%1&lt;/i&gt; 的連線?&lt;/p&gt;&lt;p&gt;&lt;b&gt;注意:&lt;/b&gt;此操作 &lt;b&gt;不會&lt;/b&gt; 刪除任何的檔案。&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1218"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1153"/>
<source>Remove connection</source>
<translation>移除連線</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="589"/>
- <location filename="../src/gui/accountsettings.cpp" line="646"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
+ <location filename="../src/gui/accountsettings.cpp" line="602"/>
<source>Open folder</source>
<translation>開啟資料夾</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="224"/>
- <location filename="../src/gui/accountsettings.cpp" line="1068"/>
- <source>Log out</source>
- <translation>登出</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Resume sync</source>
<translation>繼續同步</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="667"/>
+ <location filename="../src/gui/accountsettings.cpp" line="623"/>
<source>Pause sync</source>
<translation>暫停同步</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="742"/>
+ <location filename="../src/gui/accountsettings.cpp" line="698"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="796"/>
+ <location filename="../src/gui/accountsettings.cpp" line="752"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;您確定要停止同步資料夾 &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;注意:&lt;/b&gt; 此操作 &lt;b&gt;不會&lt;/b&gt; 刪除任何檔案&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="964"/>
+ <location filename="../src/gui/accountsettings.cpp" line="920"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) 中的 %2 正在使用, 有些資料夾,包括網路掛載或分享資料夾,可能有不同的限制。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="965"/>
+ <location filename="../src/gui/accountsettings.cpp" line="921"/>
<source>%1 of %2 in use</source>
<translation>已使用 %2 中的 %1%</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
+ <location filename="../src/gui/accountsettings.cpp" line="930"/>
<source>Currently there is no storage usage information available.</source>
<translation>目前無法查詢儲存空間使用資訊。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1031"/>
+ <location filename="../src/gui/accountsettings.cpp" line="987"/>
<source>Connecting to %1 …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1040"/>
+ <location filename="../src/gui/accountsettings.cpp" line="996"/>
<source>No %1 connection configured.</source>
<translation>沒有 %1 連線設置。</translation>
</message>
@@ -473,103 +442,62 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="127"/>
+ <location filename="../src/gui/accountstate.cpp" line="134"/>
<source>Signed out</source>
<translation>已登出</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="129"/>
+ <location filename="../src/gui/accountstate.cpp" line="136"/>
<source>Disconnected</source>
<translation>已經離線</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="131"/>
+ <location filename="../src/gui/accountstate.cpp" line="138"/>
<source>Connected</source>
<translation>已連線</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="133"/>
+ <location filename="../src/gui/accountstate.cpp" line="140"/>
<source>Service unavailable</source>
<translation>服務無法使用</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="135"/>
+ <location filename="../src/gui/accountstate.cpp" line="142"/>
<source>Maintenance mode</source>
<translation>維護模式</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="137"/>
+ <location filename="../src/gui/accountstate.cpp" line="144"/>
<source>Network error</source>
<translation>網路異常</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="139"/>
+ <location filename="../src/gui/accountstate.cpp" line="146"/>
<source>Configuration error</source>
<translation>設定錯誤</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="141"/>
+ <location filename="../src/gui/accountstate.cpp" line="148"/>
<source>Asking Credentials</source>
<translation>正在詢問憑證</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="143"/>
+ <location filename="../src/gui/accountstate.cpp" line="150"/>
<source>Unknown account state</source>
<translation>未知的帳號狀態</translation>
</message>
</context>
<context>
- <name>OCC::ActivityItemDelegate</name>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="229"/>
- <source>More information</source>
- <translation>更多資訊</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="230"/>
- <source>Accept</source>
- <translation>接受</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="231"/>
- <source>Join</source>
- <translation>加入</translation>
- </message>
- <message>
- <location filename="../src/gui/activityitemdelegate.cpp" line="252"/>
- <source>Open Browser</source>
- <translation>開啟瀏覽器</translation>
- </message>
-</context>
-<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/activitylistmodel.cpp" line="239"/>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="321"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::ActivityWidget</name>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="56"/>
- <source>Accept</source>
- <translation>接受</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="192"/>
- <source>Synced</source>
- <translation>已同步</translation>
- </message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="231"/>
- <source>Retry all uploads</source>
- <translation>重試所有的上傳</translation>
- </message>
- <message>
- <location filename="../src/gui/activitywidget.cpp" line="346"/>
- <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation>&lt;br/&gt; 帳號 %1 尚未啟用紀錄行為功能</translation>
+ <location filename="../src/gui/tray/ActivityListModel.cpp" line="423"/>
+ <source>For more activities please open the Activity app.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -680,12 +608,12 @@
<translation>沒有設置 ownCloud 帳號</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="282"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="287"/>
<source>The configured server for this client is too old</source>
<translation>設置的伺服器對這個客戶端來說太舊了</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="283"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="288"/>
<source>Please update to the latest server and restart the client.</source>
<translation>請將伺服器端更新到最新版並重新啟動客戶端</translation>
</message>
@@ -901,35 +829,35 @@
<translation>無法讀取系統的排除檔案</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="970"/>
+ <location filename="../src/gui/folder.cpp" line="972"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>一個大於%1MB的資料夾已被新增至:%2
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="973"/>
+ <location filename="../src/gui/folder.cpp" line="975"/>
<source>A folder from an external storage has been added.
</source>
<translation>一個來自外部空間的資料夾已被新增</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="974"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>若要下載此項目,請前往設定選擇它</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1029"/>
+ <location filename="../src/gui/folder.cpp" line="1031"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>已創建%1資料夾,但該資料夾已從要同步的檔案中剔除,因此不會被同步。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1032"/>
+ <location filename="../src/gui/folder.cpp" line="1034"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>已新增%1檔案,但該檔案已從要同步的檔案中剔除,因此不會被同步。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1043"/>
+ <location filename="../src/gui/folder.cpp" line="1045"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -942,7 +870,7 @@ This means that the synchronization client might not upload local changes immedi
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1088"/>
+ <location filename="../src/gui/folder.cpp" line="1090"/>
<source>All files in the sync folder '%1' were deleted on the server.
These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
@@ -953,7 +881,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a
假如您決定移除這些檔案,除非您是檔案的所有者,否則您將無法讀取這些檔案。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1093"/>
+ <location filename="../src/gui/folder.cpp" line="1095"/>
<source>All files got deleted from your local sync folder '%1'.
These files will be deleted from the server and will not be available on your other devices if they will not be restored.
If this action was unintended you can restore the lost data now.</source>
@@ -962,22 +890,22 @@ If this action was unintended you can restore the lost data now.</source>
如果您意外地做了此項動作,您可以立即復原已移除的資料。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1097"/>
+ <location filename="../src/gui/folder.cpp" line="1099"/>
<source>Delete all files?</source>
<translation>確定要移除所有檔案嗎?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1100"/>
+ <location filename="../src/gui/folder.cpp" line="1102"/>
<source>Delete all files</source>
<translation>移除所有檔案</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1101"/>
+ <location filename="../src/gui/folder.cpp" line="1103"/>
<source>Restore deleted files</source>
<translation>復原已刪除的檔案</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1118"/>
+ <location filename="../src/gui/folder.cpp" line="1120"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -986,17 +914,17 @@ Continuing the sync as normal will cause all your files to be overwritten by an
繼續正常同步將會使您的所有檔案被先前的一個版本覆蓋。您希望將目前的最新檔案儲存為衝突檔案嗎?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1123"/>
+ <location filename="../src/gui/folder.cpp" line="1125"/>
<source>Backup detected</source>
<translation>偵測到備份</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1126"/>
+ <location filename="../src/gui/folder.cpp" line="1128"/>
<source>Normal Synchronisation</source>
<translation>普通同步</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1127"/>
+ <location filename="../src/gui/folder.cpp" line="1129"/>
<source>Keep Local Files as Conflict</source>
<translation>將本地檔案視為衝突檔案</translation>
</message>
@@ -1483,22 +1411,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="521"/>
+ <location filename="../src/gui/socketapi.cpp" line="556"/>
<source>Password for share required</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="522"/>
+ <location filename="../src/gui/socketapi.cpp" line="557"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="541"/>
+ <location filename="../src/gui/socketapi.cpp" line="576"/>
<source>Sharing error</source>
<translation>分享發生錯誤</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="542"/>
+ <location filename="../src/gui/socketapi.cpp" line="577"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -2636,7 +2564,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/servernotificationhandler.cpp" line="153"/>
+ <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
<source>Dismiss</source>
<translation>我已了解</translation>
</message>
@@ -2649,22 +2577,17 @@ It is not advisable to use it.</source>
<translation>設定</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Activity</source>
- <translation>活動</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="100"/>
<source>General</source>
<translation>一般</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="110"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="109"/>
<source>Network</source>
<translation>網路</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="242"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="207"/>
<source>Account</source>
<translation>帳號</translation>
</message>
@@ -2910,60 +2833,54 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="458"/>
- <source>Share with %1</source>
- <comment>parameter is Nextcloud</comment>
- <translation>與%1分享</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="494"/>
+ <location filename="../src/gui/socketapi.cpp" line="529"/>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="633"/>
+ <location filename="../src/gui/socketapi.cpp" line="668"/>
<source>I shared something with you</source>
<translation>我與你分享了檔案</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="646"/>
- <location filename="../src/gui/socketapi.cpp" line="676"/>
+ <location filename="../src/gui/socketapi.cpp" line="681"/>
+ <location filename="../src/gui/socketapi.cpp" line="711"/>
<source>Share options</source>
<translation>分享選項</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="647"/>
- <source>Share via %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="649"/>
+ <location filename="../src/gui/socketapi.cpp" line="684"/>
<source>Send private link by email …</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="648"/>
+ <location filename="../src/gui/socketapi.cpp" line="683"/>
<source>Copy private link to clipboard</source>
<translation>將私用連結複製至剪貼簿</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="674"/>
+ <location filename="../src/gui/socketapi.cpp" line="709"/>
<source>Resharing this file is not allowed</source>
<translation>此檔案不允許二次分享</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="687"/>
- <location filename="../src/gui/socketapi.cpp" line="689"/>
+ <location filename="../src/gui/socketapi.cpp" line="722"/>
+ <location filename="../src/gui/socketapi.cpp" line="724"/>
<source>Copy public link</source>
<translation>複製公共連結</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="693"/>
+ <location filename="../src/gui/socketapi.cpp" line="728"/>
<source>Copy internal link</source>
<translation>複製內部連結</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="743"/>
+ <location filename="../src/gui/socketapi.cpp" line="782"/>
+ <source>Edit</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi.cpp" line="784"/>
<source>Open in browser</source>
<translation>用瀏覽器打開</translation>
</message>
@@ -3450,7 +3367,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="54"/>
+ <location filename="../src/gui/systray.cpp" line="128"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
@@ -3458,17 +3375,68 @@ It is not advisable to use it.</source>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="352"/>
+ <location filename="../src/libsync/theme.cpp" line="345"/>
<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="356"/>
+ <location filename="../src/libsync/theme.cpp" line="349"/>
<source>&lt;p&gt;This release was supplied by %1&lt;/p&gt;</source>
<translation>此版本由%1發佈。</translation>
</message>
</context>
<context>
+ <name>OCC::User</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <source>Retry all uploads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
+ <source>You renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
+ <source>You deleted</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
+ <source>You created</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
+ <source>You changed</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>OCC::UserModel</name>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="682"/>
+ <source>Confirm Account Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="683"/>
+ <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="688"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <source>Cancel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
<location filename="../src/gui/wizard/webview.cpp" line="208"/>
@@ -3505,234 +3473,113 @@ It is not advisable to use it.</source>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="293"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
<source>Please sign in</source>
<translation>請登入</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="339"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="330"/>
<source>Folder %1: %2</source>
<translation>資料夾 %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="357"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="348"/>
<source>There are no sync folders configured.</source>
<translation>尚未設置同步資料夾。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="366"/>
- <source>Open in browser</source>
- <translation>用瀏覽器開啟</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="419"/>
- <source>Log out</source>
- <translation>登出</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="514"/>
- <source>Recent Changes</source>
- <translation>最近的更動</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
- <source>Managed Folders:</source>
- <translation>管理的資料夾:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="396"/>
- <source>Open folder &apos;%1&apos;</source>
- <translation>開啟 %1 資料夾</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="368"/>
- <source>Open %1 in browser</source>
- <translation>瀏覽器中開啟 %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="776"/>
- <source>Unknown status</source>
- <translation>未知狀態</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="788"/>
- <source>Help</source>
- <translation>說明</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="790"/>
- <source>Quit %1</source>
- <translation>離開 %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="265"/>
<source>Disconnected from %1</source>
<translation>從 %1 斷線</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="224"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="215"/>
<source>Unsupported Server Version</source>
<translation>不支援此伺服器版本</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="225"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="216"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>%1帳戶所在的伺服器正運行不受支援的舊版本%2。此客戶端在該伺服器版本上未經測試,可能會有風險。請慎行。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="264"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="255"/>
<source>Disconnected</source>
<translation>已經離線</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="266"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="257"/>
<source>Disconnected from some accounts</source>
<translation>已從一些帳戶斷開</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Disconnected from accounts:</source>
<translation>已從帳號離線:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="279"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="270"/>
<source>Account %1: %2</source>
<translation>帳號 %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Signed out</source>
<translation>已登出</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="298"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="289"/>
<source>Account synchronization is disabled</source>
<translation>已禁用帳戶同步</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="299"/>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="290"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Synchronization is paused</source>
<translation>已暫停同步</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="347"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="338"/>
<source>Unresolved conflicts</source>
<translation>未解決的衝突</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="345"/>
<source>Error during synchronization</source>
<translation>同步時發生錯誤</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="358"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="349"/>
<source>No sync folders configured</source>
<translation>尚未設定同步資料夾</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="404"/>
- <source>Resume all folders</source>
- <translation>繼續所有資料夾</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="409"/>
- <source>Pause all folders</source>
- <translation>暫停所有資料夾</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <source>Log in …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="692"/>
- <source>Resume all synchronization</source>
- <translation>繼續所有同步項目</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="694"/>
- <source>Resume synchronization</source>
- <translation>繼續同步</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="702"/>
- <source>Pause all synchronization</source>
- <translation>暫停所有同步項目</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="704"/>
- <source>Pause synchronization</source>
- <translation>暫停同步</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="937"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="413"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="794"/>
- <source>Crash now</source>
- <comment>Only shows in debug mode to allow testing the crash handler</comment>
- <translation>發生非預期結果</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="778"/>
- <source>Apps</source>
- <translation>應用程式</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="780"/>
- <source>Settings …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="781"/>
- <source>New account …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="782"/>
- <source>View more activity …</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="897"/>
- <source>No items synced recently</source>
- <translation>最近沒有項目被同步</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="919"/>
- <source>Checking for changes in remote &apos;%1&apos;</source>
- <translation>正在檢查遠端「%1」中的變更</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="922"/>
- <source>Checking for changes in local &apos;%1&apos;</source>
- <translation>正在檢查本地「%1」中的變更</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="942"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="418"/>
<source>Syncing %1 of %2</source>
<translation>正在同步第%1項,共%2項</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="951"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="427"/>
<source>Syncing %1 (%2 left)</source>
<translation>正在同步%1(剩餘%2項)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="954"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="430"/>
<source>Syncing %1</source>
<translation>正在同步%1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="972"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="440"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="349"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="340"/>
<source>Up to date</source>
<translation>最新的</translation>
</message>
@@ -4004,7 +3851,7 @@ It is not advisable to use it.</source>
<context>
<name>nextcloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="336"/>
+ <location filename="../src/libsync/theme.cpp" line="329"/>
<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>