[Pkg-owncloud-commits] [owncloud-client] 268/470: [tx-robot] updated from transifex
Sandro Knauß
hefee-guest at moszumanska.debian.org
Thu May 12 16:25:12 UTC 2016
This is an automated email from the git hooks/post-receive script.
hefee-guest pushed a commit to branch master
in repository owncloud-client.
commit 65e740301a38b12afeaa9a35cf6aa24b0ea817c7
Author: Jenkins for ownCloud <owncloud-bot at tmit.eu>
Date: Tue Apr 5 02:19:38 2016 -0400
[tx-robot] updated from transifex
---
translations/client_ca.ts | 150 ++++++++++++++++++++++--------
translations/client_cs.ts | 150 ++++++++++++++++++++++--------
translations/client_de.ts | 150 ++++++++++++++++++++++--------
translations/client_el.ts | 150 ++++++++++++++++++++++--------
translations/client_en.ts | 156 +++++++++++++++++++++++--------
translations/client_es.ts | 154 +++++++++++++++++++++++--------
translations/client_es_AR.ts | 150 ++++++++++++++++++++++--------
translations/client_et.ts | 150 ++++++++++++++++++++++--------
translations/client_eu.ts | 150 ++++++++++++++++++++++--------
translations/client_fa.ts | 150 ++++++++++++++++++++++--------
translations/client_fi.ts | 150 ++++++++++++++++++++++--------
translations/client_fr.ts | 150 ++++++++++++++++++++++--------
translations/client_gl.ts | 150 ++++++++++++++++++++++--------
translations/client_hu.ts | 150 ++++++++++++++++++++++--------
translations/client_it.ts | 150 ++++++++++++++++++++++--------
translations/client_ja.ts | 150 ++++++++++++++++++++++--------
translations/client_nb_NO.ts | 150 ++++++++++++++++++++++--------
translations/client_nl.ts | 150 ++++++++++++++++++++++--------
translations/client_pl.ts | 213 +++++++++++++++++++++++++++++--------------
translations/client_pt.ts | 150 ++++++++++++++++++++++--------
translations/client_pt_BR.ts | 150 ++++++++++++++++++++++--------
translations/client_ru.ts | 150 ++++++++++++++++++++++--------
translations/client_sk.ts | 150 ++++++++++++++++++++++--------
translations/client_sl.ts | 150 ++++++++++++++++++++++--------
translations/client_sr.ts | 150 ++++++++++++++++++++++--------
translations/client_sv.ts | 150 ++++++++++++++++++++++--------
translations/client_th.ts | 150 ++++++++++++++++++++++--------
translations/client_tr.ts | 150 ++++++++++++++++++++++--------
translations/client_uk.ts | 150 ++++++++++++++++++++++--------
translations/client_zh_CN.ts | 150 ++++++++++++++++++++++--------
translations/client_zh_TW.ts | 150 ++++++++++++++++++++++--------
31 files changed, 3515 insertions(+), 1208 deletions(-)
diff --git a/translations/client_ca.ts b/translations/client_ca.ts
index f61564e..f2c2628 100644
--- a/translations/client_ca.ts
+++ b/translations/client_ca.ts
@@ -64,6 +64,29 @@
</message>
</context>
<context>
+ <name>NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="20"/>
+ <source>Form</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="56"/>
+ <source>Lorem ipsum dolor sit amet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="63"/>
+ <source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="83"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountSettings</name>
<message>
<location filename="../src/gui/accountsettings.ui" line="14"/>
@@ -323,53 +346,53 @@
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="414"/>
- <location filename="../src/gui/activitywidget.cpp" line="456"/>
+ <location filename="../src/gui/activitywidget.cpp" line="496"/>
+ <location filename="../src/gui/activitywidget.cpp" line="548"/>
<source>Server Activity</source>
<translation>Activitat del servidor</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="419"/>
+ <location filename="../src/gui/activitywidget.cpp" line="502"/>
<source>Sync Protocol</source>
<translation>Protocol de sincronització</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="425"/>
+ <location filename="../src/gui/activitywidget.cpp" line="508"/>
<source>List of ignored or erroneous files</source>
<translation>Llista de fitxers ignorats o erronis</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="429"/>
+ <location filename="../src/gui/activitywidget.cpp" line="512"/>
<source>Copy</source>
<translation>Còpia</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="430"/>
+ <location filename="../src/gui/activitywidget.cpp" line="513"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Copia la llista d'activitats al porta-retalls.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="435"/>
+ <location filename="../src/gui/activitywidget.cpp" line="518"/>
<source>Not Synced</source>
<translation>No sincronitzat</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="471"/>
+ <location filename="../src/gui/activitywidget.cpp" line="563"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation>La llista de l'activitat del servidor s'ha copiat al porta-retalls.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="475"/>
+ <location filename="../src/gui/activitywidget.cpp" line="567"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="478"/>
+ <location filename="../src/gui/activitywidget.cpp" line="570"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="483"/>
+ <location filename="../src/gui/activitywidget.cpp" line="575"/>
<source>Copied to clipboard</source>
<translation>S'ha copiat al porta-retalls</translation>
</message>
@@ -383,30 +406,56 @@
</message>
<message>
<location filename="../src/gui/activitywidget.ui" line="20"/>
- <location filename="../src/gui/activitywidget.ui" line="30"/>
+ <location filename="../src/gui/activitywidget.ui" line="50"/>
+ <location filename="../src/gui/activitywidget.ui" line="67"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="311"/>
+ <location filename="../src/gui/activitywidget.cpp" line="133"/>
<source>Server Activities</source>
<translation>Activitats del servidor</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="284"/>
+ <location filename="../src/gui/activitywidget.cpp" line="88"/>
<source>Copy</source>
<translation>Còpia</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="285"/>
+ <location filename="../src/gui/activitywidget.cpp" line="89"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Copia la llista d'activitats al porta-retalls.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="318"/>
+ <location filename="../src/gui/activitywidget.cpp" line="137"/>
+ <source>Action Required: Notifications</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="142"/>
<source><br/>Account %1 does not have activities enabled.</source>
<translation type="unfinished"/>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="334"/>
+ <source>You received %n new notification(s) from %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="342"/>
+ <source>You received %n new notification(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="344"/>
+ <source>You received new notifications from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="348"/>
+ <source>%1 Notifications - Action Required</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
@@ -1465,6 +1514,31 @@ Els elements que poden ser eliminats s'eliminaran si impedeixen que una car
</message>
</context>
<context>
+ <name>OCC::NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="50"/>
+ <source>Created at %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="99"/>
+ <source>Closing in a few seconds...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="133"/>
+ <source>%1 request failed at %2</source>
+ <extracomment>The second parameter is a time, such as 'failed at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="139"/>
+ <source>'%1' selected at %2</source>
+ <extracomment>The second parameter is a time, such as 'selected at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::OCUpdater</name>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="103"/>
@@ -2194,22 +2268,22 @@ No és aconsellada usar-la.</translation>
<translation>Arranjament</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="85"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="87"/>
<source>Activity</source>
<translation>Activitat</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="93"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>General</source>
<translation>General</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="99"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="102"/>
<source>Network</source>
<translation>Xarxa</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="197"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="199"/>
<source>Account</source>
<translation>Compte</translation>
</message>
@@ -2754,18 +2828,18 @@ No és aconsellada usar-la.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="687"/>
+ <location filename="../src/libsync/syncengine.cpp" line="690"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1089"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1101"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1096"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1108"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
@@ -2855,69 +2929,69 @@ No és aconsellada usar-la.</translation>
<translation>La codificació del nom de fitxer no és vàlida</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="632"/>
+ <location filename="../src/libsync/syncengine.cpp" line="635"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Caràcters no vàlids. Reanomeneu "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="721"/>
+ <location filename="../src/libsync/syncengine.cpp" line="724"/>
<source>Unable to initialize a sync journal.</source>
<translation>No es pot inicialitzar un periòdic de sincronització</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="804"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Cannot open the sync journal</source>
<translation>No es pot obrir el diari de sincronització</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="858"/>
+ <location filename="../src/libsync/syncengine.cpp" line="861"/>
<source>File name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1057"/>
- <location filename="../src/libsync/syncengine.cpp" line="1064"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1067"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>S'ignora degut al filtre a «Trieu què sincronitzar»</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1083"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1128"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>No es permet pujar aquest fitxer perquè només és de lectura en el servidor, es restaura</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1133"/>
- <location filename="../src/libsync/syncengine.cpp" line="1153"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1145"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
<source>Not allowed to remove, restoring</source>
<translation>No es permet l'eliminació, es restaura</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1178"/>
<source>Local files and share folder removed.</source>
<translation>Fitxers locals i carpeta compartida esborrats.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1221"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1233"/>
<source>Move not allowed, item restored</source>
<translation>No es permet moure'l, l'element es restaura</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1242"/>
<source>Move not allowed because %1 is read-only</source>
<translation>No es permet moure perquè %1 només és de lectura</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the destination</source>
<translation>el destí</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the source</source>
<translation>l'origen</translation>
</message>
diff --git a/translations/client_cs.ts b/translations/client_cs.ts
index 00f744d..5a172d7 100644
--- a/translations/client_cs.ts
+++ b/translations/client_cs.ts
@@ -64,6 +64,29 @@
</message>
</context>
<context>
+ <name>NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="20"/>
+ <source>Form</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="56"/>
+ <source>Lorem ipsum dolor sit amet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="63"/>
+ <source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="83"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountSettings</name>
<message>
<location filename="../src/gui/accountsettings.ui" line="14"/>
@@ -323,53 +346,53 @@
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="414"/>
- <location filename="../src/gui/activitywidget.cpp" line="456"/>
+ <location filename="../src/gui/activitywidget.cpp" line="496"/>
+ <location filename="../src/gui/activitywidget.cpp" line="548"/>
<source>Server Activity</source>
<translation>Aktivita serveru</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="419"/>
+ <location filename="../src/gui/activitywidget.cpp" line="502"/>
<source>Sync Protocol</source>
<translation>Protokol synchronizace</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="425"/>
+ <location filename="../src/gui/activitywidget.cpp" line="508"/>
<source>List of ignored or erroneous files</source>
<translation>Seznam ignorovaných nebo poškozených souborů</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="429"/>
+ <location filename="../src/gui/activitywidget.cpp" line="512"/>
<source>Copy</source>
<translation>Kopie</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="430"/>
+ <location filename="../src/gui/activitywidget.cpp" line="513"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Kopírovat záznam aktivity do schránky.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="435"/>
+ <location filename="../src/gui/activitywidget.cpp" line="518"/>
<source>Not Synced</source>
<translation>Nesesynchronizováno</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="471"/>
+ <location filename="../src/gui/activitywidget.cpp" line="563"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation>Výpis aktivity serveru byl zkopírován do schránky.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="475"/>
+ <location filename="../src/gui/activitywidget.cpp" line="567"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation>Výpis aktivity synchronizace byl zkopírován do schránky.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="478"/>
+ <location filename="../src/gui/activitywidget.cpp" line="570"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation>Seznam nesynchronizovaných položek byl zkopírován do schránky.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="483"/>
+ <location filename="../src/gui/activitywidget.cpp" line="575"/>
<source>Copied to clipboard</source>
<translation>Zkopírováno do schránky</translation>
</message>
@@ -383,30 +406,56 @@
</message>
<message>
<location filename="../src/gui/activitywidget.ui" line="20"/>
- <location filename="../src/gui/activitywidget.ui" line="30"/>
+ <location filename="../src/gui/activitywidget.ui" line="50"/>
+ <location filename="../src/gui/activitywidget.ui" line="67"/>
<source>TextLabel</source>
<translation>Textový popisek</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="311"/>
+ <location filename="../src/gui/activitywidget.cpp" line="133"/>
<source>Server Activities</source>
<translation>Aktivity serveru</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="284"/>
+ <location filename="../src/gui/activitywidget.cpp" line="88"/>
<source>Copy</source>
<translation>Kopie</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="285"/>
+ <location filename="../src/gui/activitywidget.cpp" line="89"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Kopírovat záznam aktivity do schránky.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="318"/>
+ <location filename="../src/gui/activitywidget.cpp" line="137"/>
+ <source>Action Required: Notifications</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="142"/>
<source><br/>Account %1 does not have activities enabled.</source>
<translation><br/>Účet %1 nemá zapnuté aktivity.</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="334"/>
+ <source>You received %n new notification(s) from %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="342"/>
+ <source>You received %n new notification(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="344"/>
+ <source>You received new notifications from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="348"/>
+ <source>%1 Notifications - Action Required</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
@@ -1468,6 +1517,31 @@ Položky u kterých je povoleno smazání budou vymazány, pokud by bránily ods
</message>
</context>
<context>
+ <name>OCC::NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="50"/>
+ <source>Created at %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="99"/>
+ <source>Closing in a few seconds...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="133"/>
+ <source>%1 request failed at %2</source>
+ <extracomment>The second parameter is a time, such as 'failed at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="139"/>
+ <source>'%1' selected at %2</source>
+ <extracomment>The second parameter is a time, such as 'selected at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::OCUpdater</name>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="103"/>
@@ -2201,22 +2275,22 @@ Nedoporučuje se jí používat.</translation>
<translation>Nastavení</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="85"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="87"/>
<source>Activity</source>
<translation>Aktivita</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="93"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>General</source>
<translation>Hlavní</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="99"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="102"/>
<source>Network</source>
<translation>Síť</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="197"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="199"/>
<source>Account</source>
<translation>Účet</translation>
</message>
@@ -2761,18 +2835,18 @@ Nedoporučuje se jí používat.</translation>
<translation>Soubor/adresář je ignorován, protože je skrytý.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="687"/>
+ <location filename="../src/libsync/syncengine.cpp" line="690"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Je dostupných pouze %1, pro spuštění je potřeba alespoň %2</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1089"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1101"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Není povoleno, protože nemáte oprávnění vytvořit nadřazený adresář</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1096"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1108"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Není povoleno, protože nemáte oprávnění přidávat soubory do tohoto adresáře</translation>
</message>
@@ -2862,69 +2936,69 @@ Nedoporučuje se jí používat.</translation>
<translation>Kódování znaků jména soubor je neplatné</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="632"/>
+ <location filename="../src/libsync/syncengine.cpp" line="635"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Neplatné znaky, prosím přejmenujte "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="721"/>
+ <location filename="../src/libsync/syncengine.cpp" line="724"/>
<source>Unable to initialize a sync journal.</source>
<translation>Nemohu inicializovat synchronizační žurnál.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="804"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Cannot open the sync journal</source>
<translation>Nelze otevřít synchronizační žurnál</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="858"/>
+ <location filename="../src/libsync/syncengine.cpp" line="861"/>
<source>File name contains at least one invalid character</source>
<translation>Jméno souboru obsahuje aelspoň jeden neplatný znak</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1057"/>
- <location filename="../src/libsync/syncengine.cpp" line="1064"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1067"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignorováno podle nastavení "vybrat co synchronizovat"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1083"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Není povoleno, protože nemáte oprávnění přidávat podadresáře do tohoto adresáře</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1128"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Není povoleno nahrát tento soubor, protože je na serveru uložen pouze pro čtení, obnovuji</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1133"/>
- <location filename="../src/libsync/syncengine.cpp" line="1153"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1145"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
<source>Not allowed to remove, restoring</source>
<translation>Odstranění není povoleno, obnovuji</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1178"/>
<source>Local files and share folder removed.</source>
<translation>Místní soubory a sdílená složka byly odstraněny.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1221"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1233"/>
<source>Move not allowed, item restored</source>
<translation>Přesun není povolen, položka obnovena</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1242"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Přesun není povolen, protože %1 je pouze pro čtení</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the destination</source>
<translation>cílové umístění</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the source</source>
<translation>zdroj</translation>
</message>
diff --git a/translations/client_de.ts b/translations/client_de.ts
index c8c66c7..3e28042 100644
--- a/translations/client_de.ts
+++ b/translations/client_de.ts
@@ -64,6 +64,29 @@
</message>
</context>
<context>
+ <name>NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="20"/>
+ <source>Form</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="56"/>
+ <source>Lorem ipsum dolor sit amet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="63"/>
+ <source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="83"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountSettings</name>
<message>
<location filename="../src/gui/accountsettings.ui" line="14"/>
@@ -323,53 +346,53 @@
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="414"/>
- <location filename="../src/gui/activitywidget.cpp" line="456"/>
+ <location filename="../src/gui/activitywidget.cpp" line="496"/>
+ <location filename="../src/gui/activitywidget.cpp" line="548"/>
<source>Server Activity</source>
<translation>Server Aktivität</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="419"/>
+ <location filename="../src/gui/activitywidget.cpp" line="502"/>
<source>Sync Protocol</source>
<translation>Synchronisationsprotokoll</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="425"/>
+ <location filename="../src/gui/activitywidget.cpp" line="508"/>
<source>List of ignored or erroneous files</source>
<translation>Liste von ignorierten oder feherhaften Dateien</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="429"/>
+ <location filename="../src/gui/activitywidget.cpp" line="512"/>
<source>Copy</source>
<translation>Kopieren</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="430"/>
+ <location filename="../src/gui/activitywidget.cpp" line="513"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Aktivitätsliste in die Zwischenablage kopieren.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="435"/>
+ <location filename="../src/gui/activitywidget.cpp" line="518"/>
<source>Not Synced</source>
<translation>nicht synchronisiert</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="471"/>
+ <location filename="../src/gui/activitywidget.cpp" line="563"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation>Die Server-Aktivitätsliste wurde in die Zwischenablage kopiert. </translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="475"/>
+ <location filename="../src/gui/activitywidget.cpp" line="567"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation>Die Synchronisationsliste wurde in die Zwischenablage kopiert.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="478"/>
+ <location filename="../src/gui/activitywidget.cpp" line="570"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation>Die Liste der unsynchronisierten Dateien wurde in die Zwischenablage kopiert.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="483"/>
+ <location filename="../src/gui/activitywidget.cpp" line="575"/>
<source>Copied to clipboard</source>
<translation>In die Zwischenablage kopiert</translation>
</message>
@@ -383,30 +406,56 @@
</message>
<message>
<location filename="../src/gui/activitywidget.ui" line="20"/>
- <location filename="../src/gui/activitywidget.ui" line="30"/>
+ <location filename="../src/gui/activitywidget.ui" line="50"/>
+ <location filename="../src/gui/activitywidget.ui" line="67"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="311"/>
+ <location filename="../src/gui/activitywidget.cpp" line="133"/>
<source>Server Activities</source>
<translation>Server Aktivitäten</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="284"/>
+ <location filename="../src/gui/activitywidget.cpp" line="88"/>
<source>Copy</source>
<translation>Kopieren</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="285"/>
+ <location filename="../src/gui/activitywidget.cpp" line="89"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Aktivitätsliste in die Zwischenablage kopieren.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="318"/>
+ <location filename="../src/gui/activitywidget.cpp" line="137"/>
+ <source>Action Required: Notifications</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="142"/>
<source><br/>Account %1 does not have activities enabled.</source>
<translation><br/>Für Konto %1 sind serverseitig keine Aktivitäten aktiviert.</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="334"/>
+ <source>You received %n new notification(s) from %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="342"/>
+ <source>You received %n new notification(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="344"/>
+ <source>You received new notifications from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="348"/>
+ <source>%1 Notifications - Action Required</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
@@ -1467,6 +1516,31 @@ Objekte, bei denen Löschen erlaubt ist, werden gelöscht, wenn sie die Löschun
</message>
</context>
<context>
+ <name>OCC::NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="50"/>
+ <source>Created at %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="99"/>
+ <source>Closing in a few seconds...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="133"/>
+ <source>%1 request failed at %2</source>
+ <extracomment>The second parameter is a time, such as 'failed at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="139"/>
+ <source>'%1' selected at %2</source>
+ <extracomment>The second parameter is a time, such as 'selected at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::OCUpdater</name>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="103"/>
@@ -2198,22 +2272,22 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<translation>Einstellungen</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="85"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="87"/>
<source>Activity</source>
<translation>Aktivität</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="93"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>General</source>
<translation>Allgemein</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="99"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="102"/>
<source>Network</source>
<translation>Netzwerk</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="197"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="199"/>
<source>Account</source>
<translation>Benutzerkonto</translation>
</message>
@@ -2758,18 +2832,18 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<translation>Datei wird ignoriert, weil sie versteckt ist.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="687"/>
+ <location filename="../src/libsync/syncengine.cpp" line="690"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Nur %1 sind verfügbar. Zum Beginnen werden mindestens %2 benötigt.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1089"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1101"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Nicht erlaubt, da Sie keine Rechte zur Erstellung von Unterordnern haben</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1096"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1108"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Nicht erlaubt, da Sie keine Rechte zum Hinzufügen von Dateien in diesen Ordner haben</translation>
</message>
@@ -2859,69 +2933,69 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<translation>Dateikodierung ist ungültig</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="632"/>
+ <location filename="../src/libsync/syncengine.cpp" line="635"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Ungültige Zeichenm bitte benennen Sie "%1" um</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="721"/>
+ <location filename="../src/libsync/syncengine.cpp" line="724"/>
<source>Unable to initialize a sync journal.</source>
<translation>Synchronisationsbericht konnte nicht initialisiert werden.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="804"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Cannot open the sync journal</source>
<translation>Synchronisationsbericht kann nicht geöffnet werden</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="858"/>
+ <location filename="../src/libsync/syncengine.cpp" line="861"/>
<source>File name contains at least one invalid character</source>
<translation>Der Dateiname enthält mindestens ein ungültiges Zeichen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1057"/>
- <location filename="../src/libsync/syncengine.cpp" line="1064"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1067"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Aufgrund der »Zu synchronisierende Elemente auswählen«-Sperrliste ignoriert</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1083"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Nicht erlaubt, da Sie keine Rechte zur Erstellung von Unterordnern haben</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1128"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Das Hochladen dieser Datei ist nicht erlaubt, da die Datei auf dem Server schreibgeschützt ist, Wiederherstellung</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1133"/>
- <location filename="../src/libsync/syncengine.cpp" line="1153"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1145"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
<source>Not allowed to remove, restoring</source>
<translation>Löschen nicht erlaubt, Wiederherstellung</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1178"/>
<source>Local files and share folder removed.</source>
<translation>Lokale Dateien und Freigabeordner wurden entfernt.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1221"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1233"/>
<source>Move not allowed, item restored</source>
<translation>Verschieben nicht erlaubt, Element wiederhergestellt</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1242"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Verschieben nicht erlaubt, da %1 schreibgeschützt ist</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the destination</source>
<translation>Das Ziel</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the source</source>
<translation>Die Quelle</translation>
</message>
diff --git a/translations/client_el.ts b/translations/client_el.ts
index b534b41..60dae49 100644
--- a/translations/client_el.ts
+++ b/translations/client_el.ts
@@ -64,6 +64,29 @@
</message>
</context>
<context>
+ <name>NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="20"/>
+ <source>Form</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="56"/>
+ <source>Lorem ipsum dolor sit amet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="63"/>
+ <source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="83"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountSettings</name>
<message>
<location filename="../src/gui/accountsettings.ui" line="14"/>
@@ -323,53 +346,53 @@
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="414"/>
- <location filename="../src/gui/activitywidget.cpp" line="456"/>
+ <location filename="../src/gui/activitywidget.cpp" line="496"/>
+ <location filename="../src/gui/activitywidget.cpp" line="548"/>
<source>Server Activity</source>
<translation>Δραστηριότητα διακομιστή</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="419"/>
+ <location filename="../src/gui/activitywidget.cpp" line="502"/>
<source>Sync Protocol</source>
<translation>Προτοκολο συγχρονισμου</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="425"/>
+ <location filename="../src/gui/activitywidget.cpp" line="508"/>
<source>List of ignored or erroneous files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="429"/>
+ <location filename="../src/gui/activitywidget.cpp" line="512"/>
<source>Copy</source>
<translation>Αντιγραφή</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="430"/>
+ <location filename="../src/gui/activitywidget.cpp" line="513"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Αντιγραφή της λίστας δραστηριότητας στο πρόχειρο.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="435"/>
+ <location filename="../src/gui/activitywidget.cpp" line="518"/>
<source>Not Synced</source>
<translation>Δεν είναι συγχρονισμένα</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="471"/>
+ <location filename="../src/gui/activitywidget.cpp" line="563"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="475"/>
+ <location filename="../src/gui/activitywidget.cpp" line="567"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="478"/>
+ <location filename="../src/gui/activitywidget.cpp" line="570"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="483"/>
+ <location filename="../src/gui/activitywidget.cpp" line="575"/>
<source>Copied to clipboard</source>
<translation>Αντιγράφηκε στο πρόχειρο</translation>
</message>
@@ -383,30 +406,56 @@
</message>
<message>
<location filename="../src/gui/activitywidget.ui" line="20"/>
- <location filename="../src/gui/activitywidget.ui" line="30"/>
+ <location filename="../src/gui/activitywidget.ui" line="50"/>
+ <location filename="../src/gui/activitywidget.ui" line="67"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="311"/>
+ <location filename="../src/gui/activitywidget.cpp" line="133"/>
<source>Server Activities</source>
<translation>Δραστηριότητες διακομιστή</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="284"/>
+ <location filename="../src/gui/activitywidget.cpp" line="88"/>
<source>Copy</source>
<translation>Αντιγραφή</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="285"/>
+ <location filename="../src/gui/activitywidget.cpp" line="89"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Αντιγραφή της λίστας δραστηριότητας στο πρόχειρο.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="318"/>
+ <location filename="../src/gui/activitywidget.cpp" line="137"/>
+ <source>Action Required: Notifications</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="142"/>
<source><br/>Account %1 does not have activities enabled.</source>
<translation type="unfinished"/>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="334"/>
+ <source>You received %n new notification(s) from %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="342"/>
+ <source>You received %n new notification(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="344"/>
+ <source>You received new notifications from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="348"/>
+ <source>%1 Notifications - Action Required</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
@@ -1466,6 +1515,31 @@ Items where deletion is allowed will be deleted if they prevent a directory from
</message>
</context>
<context>
+ <name>OCC::NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="50"/>
+ <source>Created at %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="99"/>
+ <source>Closing in a few seconds...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="133"/>
+ <source>%1 request failed at %2</source>
+ <extracomment>The second parameter is a time, such as 'failed at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="139"/>
+ <source>'%1' selected at %2</source>
+ <extracomment>The second parameter is a time, such as 'selected at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::OCUpdater</name>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="103"/>
@@ -2199,22 +2273,22 @@ It is not advisable to use it.</source>
<translation>Ρυθμίσεις</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="85"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="87"/>
<source>Activity</source>
<translation>Δραστηριότητα</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="93"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>General</source>
<translation>Γενικά</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="99"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="102"/>
<source>Network</source>
<translation>Δίκτυο</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="197"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="199"/>
<source>Account</source>
<translation>Λογαριασμός</translation>
</message>
@@ -2759,18 +2833,18 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="687"/>
+ <location filename="../src/libsync/syncengine.cpp" line="690"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Μόνο %1 είναι διαθέσιμα, απαιτούνται τουλάχιστον %2 για την εκκίνηση</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1089"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1101"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε γονικό κατάλογο</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1096"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1108"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε αρχεία σε αυτόν τον φάκελο</translation>
</message>
@@ -2860,69 +2934,69 @@ It is not advisable to use it.</source>
<translation>Η κωδικοποίηση του ονόματος αρχείου δεν είναι έγκυρη</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="632"/>
+ <location filename="../src/libsync/syncengine.cpp" line="635"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Μη έγκυροι χαρακτήρες, παρακαλώ μετονομάστε το "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="721"/>
+ <location filename="../src/libsync/syncengine.cpp" line="724"/>
<source>Unable to initialize a sync journal.</source>
<translation>Αδυναμία προετοιμασίας αρχείου συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="804"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Cannot open the sync journal</source>
<translation>Αδυναμία ανοίγματος του αρχείου συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="858"/>
+ <location filename="../src/libsync/syncengine.cpp" line="861"/>
<source>File name contains at least one invalid character</source>
<translation>Το όνομα αρχείου περιέχει έναν τουλάχιστον μη έγκυρο χαρακτήρα</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1057"/>
- <location filename="../src/libsync/syncengine.cpp" line="1064"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1067"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Αγνοήθηκε εξαιτίας της μαύρης λίστας "διάλεξε τι να συγχρονιστεί"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1083"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε υποφακέλους σε αυτό τον φάκελο</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1128"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Δεν επιτρέπεται να μεταφορτώσετε αυτό το αρχείο επειδή είναι μόνο για ανάγνωση στο διακομιστή, αποκατάσταση σε εξέλιξη</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1133"/>
- <location filename="../src/libsync/syncengine.cpp" line="1153"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1145"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
<source>Not allowed to remove, restoring</source>
<translation>Δεν επιτρέπεται η αφαίρεση, αποκατάσταση σε εξέλιξη</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1178"/>
<source>Local files and share folder removed.</source>
<translation>Οι τοπικοί φάκελοι και ο φάκελος κοινής χρήσης αφαιρέθηκαν.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1221"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1233"/>
<source>Move not allowed, item restored</source>
<translation>Η μετακίνηση δεν επιτρέπεται, το αντικείμενο αποκαταστάθηκε</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1242"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Η μετακίνηση δεν επιτρέπεται επειδή το %1 είναι μόνο για ανάγνωση</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the destination</source>
<translation>ο προορισμός</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the source</source>
<translation>η προέλευση</translation>
</message>
diff --git a/translations/client_en.ts b/translations/client_en.ts
index 3d296f6..f636851 100644
--- a/translations/client_en.ts
+++ b/translations/client_en.ts
@@ -66,6 +66,29 @@
</message>
</context>
<context>
+ <name>NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="20"/>
+ <source>Form</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="56"/>
+ <source>Lorem ipsum dolor sit amet</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="63"/>
+ <source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="83"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>OCC::AccountSettings</name>
<message>
<location filename="../src/gui/accountsettings.ui" line="14"/>
@@ -325,53 +348,53 @@
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="414"/>
- <location filename="../src/gui/activitywidget.cpp" line="456"/>
+ <location filename="../src/gui/activitywidget.cpp" line="496"/>
+ <location filename="../src/gui/activitywidget.cpp" line="548"/>
<source>Server Activity</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="419"/>
+ <location filename="../src/gui/activitywidget.cpp" line="502"/>
<source>Sync Protocol</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="425"/>
+ <location filename="../src/gui/activitywidget.cpp" line="508"/>
<source>List of ignored or erroneous files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="429"/>
+ <location filename="../src/gui/activitywidget.cpp" line="512"/>
<source>Copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="430"/>
+ <location filename="../src/gui/activitywidget.cpp" line="513"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="435"/>
+ <location filename="../src/gui/activitywidget.cpp" line="518"/>
<source>Not Synced</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="471"/>
+ <location filename="../src/gui/activitywidget.cpp" line="563"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="475"/>
+ <location filename="../src/gui/activitywidget.cpp" line="567"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="478"/>
+ <location filename="../src/gui/activitywidget.cpp" line="570"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="483"/>
+ <location filename="../src/gui/activitywidget.cpp" line="575"/>
<source>Copied to clipboard</source>
<translation type="unfinished"></translation>
</message>
@@ -385,30 +408,62 @@
</message>
<message>
<location filename="../src/gui/activitywidget.ui" line="20"/>
- <location filename="../src/gui/activitywidget.ui" line="30"/>
+ <location filename="../src/gui/activitywidget.ui" line="50"/>
+ <location filename="../src/gui/activitywidget.ui" line="67"/>
<source>TextLabel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="311"/>
+ <location filename="../src/gui/activitywidget.cpp" line="133"/>
<source>Server Activities</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="284"/>
+ <location filename="../src/gui/activitywidget.cpp" line="88"/>
<source>Copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="285"/>
+ <location filename="../src/gui/activitywidget.cpp" line="89"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="318"/>
+ <location filename="../src/gui/activitywidget.cpp" line="137"/>
+ <source>Action Required: Notifications</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="142"/>
<source><br/>Account %1 does not have activities enabled.</source>
<translation type="unfinished"></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="334"/>
+ <source>You received %n new notification(s) from %2.</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="342"/>
+ <source>You received %n new notification(s) from %1 and %2.</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="344"/>
+ <source>You received new notifications from %1, %2 and other accounts.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="348"/>
+ <source>%1 Notifications - Action Required</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
@@ -1462,6 +1517,31 @@ Items where deletion is allowed will be deleted if they prevent a directory from
</message>
</context>
<context>
+ <name>OCC::NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="50"/>
+ <source>Created at %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="99"/>
+ <source>Closing in a few seconds...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="133"/>
+ <source>%1 request failed at %2</source>
+ <extracomment>The second parameter is a time, such as 'failed at 09:58pm'</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="139"/>
+ <source>'%1' selected at %2</source>
+ <extracomment>The second parameter is a time, such as 'selected at 09:58pm'</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>OCC::OCUpdater</name>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="103"/>
@@ -2193,22 +2273,22 @@ It is not advisable to use it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="85"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="87"/>
<source>Activity</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="93"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>General</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="99"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="102"/>
<source>Network</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="197"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="199"/>
<source>Account</source>
<translation type="unfinished"></translation>
</message>
@@ -2751,18 +2831,18 @@ It is not advisable to use it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="687"/>
+ <location filename="../src/libsync/syncengine.cpp" line="690"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1089"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1101"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1096"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1108"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"></translation>
</message>
@@ -2852,69 +2932,69 @@ It is not advisable to use it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="632"/>
+ <location filename="../src/libsync/syncengine.cpp" line="635"/>
<source>Invalid characters, please rename "%1"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="721"/>
+ <location filename="../src/libsync/syncengine.cpp" line="724"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="804"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="858"/>
+ <location filename="../src/libsync/syncengine.cpp" line="861"/>
<source>File name contains at least one invalid character</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1057"/>
- <location filename="../src/libsync/syncengine.cpp" line="1064"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1067"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1083"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1128"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1133"/>
- <location filename="../src/libsync/syncengine.cpp" line="1153"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1145"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1178"/>
<source>Local files and share folder removed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1221"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1233"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1242"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the destination</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the source</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/client_es.ts b/translations/client_es.ts
index 86fe639..ca48add 100644
--- a/translations/client_es.ts
+++ b/translations/client_es.ts
@@ -64,6 +64,29 @@
</message>
</context>
<context>
+ <name>NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="20"/>
+ <source>Form</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="56"/>
+ <source>Lorem ipsum dolor sit amet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="63"/>
+ <source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="83"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountSettings</name>
<message>
<location filename="../src/gui/accountsettings.ui" line="14"/>
@@ -323,53 +346,53 @@
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="414"/>
- <location filename="../src/gui/activitywidget.cpp" line="456"/>
+ <location filename="../src/gui/activitywidget.cpp" line="496"/>
+ <location filename="../src/gui/activitywidget.cpp" line="548"/>
<source>Server Activity</source>
<translation>Actividad del servidor</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="419"/>
+ <location filename="../src/gui/activitywidget.cpp" line="502"/>
<source>Sync Protocol</source>
<translation>Protocolo de Sincronización</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="425"/>
+ <location filename="../src/gui/activitywidget.cpp" line="508"/>
<source>List of ignored or erroneous files</source>
<translation>Lista de archivos erróneos o ignorados</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="429"/>
+ <location filename="../src/gui/activitywidget.cpp" line="512"/>
<source>Copy</source>
<translation>Copiar</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="430"/>
+ <location filename="../src/gui/activitywidget.cpp" line="513"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Copie la lista de actividades al portapapeles</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="435"/>
+ <location filename="../src/gui/activitywidget.cpp" line="518"/>
<source>Not Synced</source>
<translation>No sincronizado</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="471"/>
+ <location filename="../src/gui/activitywidget.cpp" line="563"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation>La lista de la actividad del servidor se ha copiado en el portapapeles.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="475"/>
+ <location filename="../src/gui/activitywidget.cpp" line="567"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation>La lista de actividades de sincronización se ha copiado en el portapapeles.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="478"/>
+ <location filename="../src/gui/activitywidget.cpp" line="570"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation>La lista de elementos no sincronizados se ha copiado al portapapeles.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="483"/>
+ <location filename="../src/gui/activitywidget.cpp" line="575"/>
<source>Copied to clipboard</source>
<translation>Copiado al portapapeles</translation>
</message>
@@ -383,30 +406,56 @@
</message>
<message>
<location filename="../src/gui/activitywidget.ui" line="20"/>
- <location filename="../src/gui/activitywidget.ui" line="30"/>
+ <location filename="../src/gui/activitywidget.ui" line="50"/>
+ <location filename="../src/gui/activitywidget.ui" line="67"/>
<source>TextLabel</source>
<translation>Etiqueta de texto</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="311"/>
+ <location filename="../src/gui/activitywidget.cpp" line="133"/>
<source>Server Activities</source>
<translation>Actividades del servidor</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="284"/>
+ <location filename="../src/gui/activitywidget.cpp" line="88"/>
<source>Copy</source>
<translation>Copiar</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="285"/>
+ <location filename="../src/gui/activitywidget.cpp" line="89"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Copie la lista de actividades al portapapeles</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="318"/>
+ <location filename="../src/gui/activitywidget.cpp" line="137"/>
+ <source>Action Required: Notifications</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="142"/>
<source><br/>Account %1 does not have activities enabled.</source>
<translation><br/>La cuenta %1 no tiene actividades habilitadas.</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="334"/>
+ <source>You received %n new notification(s) from %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="342"/>
+ <source>You received %n new notification(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="344"/>
+ <source>You received new notifications from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="348"/>
+ <source>%1 Notifications - Action Required</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
@@ -796,7 +845,7 @@ Continuar con la sincronización hará que todos los archivos sean sobreescritos
<message>
<location filename="../src/gui/folderstatusdelegate.cpp" line="241"/>
<source>Synchronizing with local folder</source>
- <translation type="unfinished"/>
+ <translation>Sincronizando con carpeta local</translation>
</message>
<message>
<location filename="../src/gui/folderstatusdelegate.cpp" line="285"/>
@@ -909,7 +958,7 @@ Continuar con la sincronización hará que todos los archivos sean sobreescritos
<location filename="../src/gui/folderstatusmodel.cpp" line="920"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
- <translation type="unfinished"/>
+ <translation>%5 restantes, %1 de %2, archivo %3 de %4</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="926"/>
@@ -1468,6 +1517,31 @@ Los elementos cuya eliminación está permitida serán eliminados si impiden que
</message>
</context>
<context>
+ <name>OCC::NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="50"/>
+ <source>Created at %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="99"/>
+ <source>Closing in a few seconds...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="133"/>
+ <source>%1 request failed at %2</source>
+ <extracomment>The second parameter is a time, such as 'failed at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="139"/>
+ <source>'%1' selected at %2</source>
+ <extracomment>The second parameter is a time, such as 'selected at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::OCUpdater</name>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="103"/>
@@ -2197,22 +2271,22 @@ No se recomienda usarla.</translation>
<translation>Ajustes</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="85"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="87"/>
<source>Activity</source>
<translation>Actividad</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="93"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>General</source>
<translation>General</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="99"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="102"/>
<source>Network</source>
<translation>Red</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="197"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="199"/>
<source>Account</source>
<translation>Cuenta</translation>
</message>
@@ -2757,18 +2831,18 @@ No se recomienda usarla.</translation>
<translation>Se ignoran los Archivos/Carpetas ocultos.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="687"/>
+ <location filename="../src/libsync/syncengine.cpp" line="690"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Solo %1 disponible, se necesita por lo menos %2 para comenzar</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1089"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1101"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>No permitido porque no tienes permiso para añadir un directorio padre</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1096"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1108"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>No permitido porque no tienes permiso para añadir archivos a ese directorio</translation>
</message>
@@ -2858,69 +2932,69 @@ No se recomienda usarla.</translation>
<translation>Los caracteres del nombre de fichero no son válidos</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="632"/>
+ <location filename="../src/libsync/syncengine.cpp" line="635"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Caracteres inválidos, por favor renombre "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="721"/>
+ <location filename="../src/libsync/syncengine.cpp" line="724"/>
<source>Unable to initialize a sync journal.</source>
<translation>No se pudo inicializar un registro (journal) de sincronización.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="804"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Cannot open the sync journal</source>
<translation>No es posible abrir el diario de sincronización</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="858"/>
+ <location filename="../src/libsync/syncengine.cpp" line="861"/>
<source>File name contains at least one invalid character</source>
<translation>Nombre de archivo contiene al menos un caracter no válido</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1057"/>
- <location filename="../src/libsync/syncengine.cpp" line="1064"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1067"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignorado porque se encuentra en la lista negra de "elija qué va a sincronizar"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1083"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>No permitido porque no tienes permiso para añadir subdirectorios a ese directorio</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1128"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>No está permitido subir este archivo porque es de solo lectura en el servidor, restaurando.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1133"/>
- <location filename="../src/libsync/syncengine.cpp" line="1153"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1145"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
<source>Not allowed to remove, restoring</source>
<translation>No está permitido borrar, restaurando.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1178"/>
<source>Local files and share folder removed.</source>
<translation>Se han eliminado los archivos locales y la carpeta compartida.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1221"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1233"/>
<source>Move not allowed, item restored</source>
<translation>No está permitido mover, elemento restaurado.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1242"/>
<source>Move not allowed because %1 is read-only</source>
<translation>No está permitido mover, porque %1 es de sólo lectura.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the destination</source>
<translation>destino</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the source</source>
<translation>origen</translation>
</message>
diff --git a/translations/client_es_AR.ts b/translations/client_es_AR.ts
index e22c22b..df85a43 100644
--- a/translations/client_es_AR.ts
+++ b/translations/client_es_AR.ts
@@ -64,6 +64,29 @@
</message>
</context>
<context>
+ <name>NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="20"/>
+ <source>Form</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="56"/>
+ <source>Lorem ipsum dolor sit amet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="63"/>
+ <source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="83"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountSettings</name>
<message>
<location filename="../src/gui/accountsettings.ui" line="14"/>
@@ -323,53 +346,53 @@
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="414"/>
- <location filename="../src/gui/activitywidget.cpp" line="456"/>
+ <location filename="../src/gui/activitywidget.cpp" line="496"/>
+ <location filename="../src/gui/activitywidget.cpp" line="548"/>
<source>Server Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="419"/>
+ <location filename="../src/gui/activitywidget.cpp" line="502"/>
<source>Sync Protocol</source>
<translation>Protocolo de Sincronización</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="425"/>
+ <location filename="../src/gui/activitywidget.cpp" line="508"/>
<source>List of ignored or erroneous files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="429"/>
+ <location filename="../src/gui/activitywidget.cpp" line="512"/>
<source>Copy</source>
<translation>Copiar</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="430"/>
+ <location filename="../src/gui/activitywidget.cpp" line="513"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Copiar la lista de actividades al portapapeles.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="435"/>
+ <location filename="../src/gui/activitywidget.cpp" line="518"/>
<source>Not Synced</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="471"/>
+ <location filename="../src/gui/activitywidget.cpp" line="563"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="475"/>
+ <location filename="../src/gui/activitywidget.cpp" line="567"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="478"/>
+ <location filename="../src/gui/activitywidget.cpp" line="570"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="483"/>
+ <location filename="../src/gui/activitywidget.cpp" line="575"/>
<source>Copied to clipboard</source>
<translation>Copiado al portapapeles</translation>
</message>
@@ -383,30 +406,56 @@
</message>
<message>
<location filename="../src/gui/activitywidget.ui" line="20"/>
- <location filename="../src/gui/activitywidget.ui" line="30"/>
+ <location filename="../src/gui/activitywidget.ui" line="50"/>
+ <location filename="../src/gui/activitywidget.ui" line="67"/>
<source>TextLabel</source>
<translation>EtiquetaDeTexto</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="311"/>
+ <location filename="../src/gui/activitywidget.cpp" line="133"/>
<source>Server Activities</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="284"/>
+ <location filename="../src/gui/activitywidget.cpp" line="88"/>
<source>Copy</source>
<translation>Copiar</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="285"/>
+ <location filename="../src/gui/activitywidget.cpp" line="89"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Copiar la lista de actividades al portapapeles.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="318"/>
+ <location filename="../src/gui/activitywidget.cpp" line="137"/>
+ <source>Action Required: Notifications</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="142"/>
<source><br/>Account %1 does not have activities enabled.</source>
<translation type="unfinished"/>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="334"/>
+ <source>You received %n new notification(s) from %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="342"/>
+ <source>You received %n new notification(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="344"/>
+ <source>You received new notifications from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="348"/>
+ <source>%1 Notifications - Action Required</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
@@ -1457,6 +1506,31 @@ Items where deletion is allowed will be deleted if they prevent a directory from
</message>
</context>
<context>
+ <name>OCC::NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="50"/>
+ <source>Created at %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="99"/>
+ <source>Closing in a few seconds...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="133"/>
+ <source>%1 request failed at %2</source>
+ <extracomment>The second parameter is a time, such as 'failed at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="139"/>
+ <source>'%1' selected at %2</source>
+ <extracomment>The second parameter is a time, such as 'selected at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::OCUpdater</name>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="103"/>
@@ -2182,22 +2256,22 @@ It is not advisable to use it.</source>
<translation>Configuración</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="85"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="87"/>
<source>Activity</source>
<translation>Actividad</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="93"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>General</source>
<translation>General</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="99"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="102"/>
<source>Network</source>
<translation>Red</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="197"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="199"/>
<source>Account</source>
<translation>Cuenta</translation>
</message>
@@ -2740,18 +2814,18 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="687"/>
+ <location filename="../src/libsync/syncengine.cpp" line="690"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1089"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1101"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1096"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1108"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
@@ -2841,69 +2915,69 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="632"/>
+ <location filename="../src/libsync/syncengine.cpp" line="635"/>
<source>Invalid characters, please rename "%1"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="721"/>
+ <location filename="../src/libsync/syncengine.cpp" line="724"/>
<source>Unable to initialize a sync journal.</source>
<translation>Imposible inicializar un diario de sincronización.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="804"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="858"/>
+ <location filename="../src/libsync/syncengine.cpp" line="861"/>
<source>File name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1057"/>
- <location filename="../src/libsync/syncengine.cpp" line="1064"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1067"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1083"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1128"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1133"/>
- <location filename="../src/libsync/syncengine.cpp" line="1153"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1145"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1178"/>
<source>Local files and share folder removed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1221"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1233"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1242"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the destination</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the source</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_et.ts b/translations/client_et.ts
index 00a9cfe..17ae88b 100644
--- a/translations/client_et.ts
+++ b/translations/client_et.ts
@@ -64,6 +64,29 @@
</message>
</context>
<context>
+ <name>NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="20"/>
+ <source>Form</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="56"/>
+ <source>Lorem ipsum dolor sit amet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="63"/>
+ <source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="83"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountSettings</name>
<message>
<location filename="../src/gui/accountsettings.ui" line="14"/>
@@ -323,53 +346,53 @@
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="414"/>
- <location filename="../src/gui/activitywidget.cpp" line="456"/>
+ <location filename="../src/gui/activitywidget.cpp" line="496"/>
+ <location filename="../src/gui/activitywidget.cpp" line="548"/>
<source>Server Activity</source>
<translation>Serveri aktiivsus</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="419"/>
+ <location filename="../src/gui/activitywidget.cpp" line="502"/>
<source>Sync Protocol</source>
<translation>Sünkroniseerimisprotokoll</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="425"/>
+ <location filename="../src/gui/activitywidget.cpp" line="508"/>
<source>List of ignored or erroneous files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="429"/>
+ <location filename="../src/gui/activitywidget.cpp" line="512"/>
<source>Copy</source>
<translation>Kopeeri</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="430"/>
+ <location filename="../src/gui/activitywidget.cpp" line="513"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Kopeeri tegevuste nimistu puhvrisse.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="435"/>
+ <location filename="../src/gui/activitywidget.cpp" line="518"/>
<source>Not Synced</source>
<translation>Pole sünkroonitud</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="471"/>
+ <location filename="../src/gui/activitywidget.cpp" line="563"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="475"/>
+ <location filename="../src/gui/activitywidget.cpp" line="567"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="478"/>
+ <location filename="../src/gui/activitywidget.cpp" line="570"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="483"/>
+ <location filename="../src/gui/activitywidget.cpp" line="575"/>
<source>Copied to clipboard</source>
<translation>Kopeeritud lõikepuhvrisse</translation>
</message>
@@ -383,30 +406,56 @@
</message>
<message>
<location filename="../src/gui/activitywidget.ui" line="20"/>
- <location filename="../src/gui/activitywidget.ui" line="30"/>
+ <location filename="../src/gui/activitywidget.ui" line="50"/>
+ <location filename="../src/gui/activitywidget.ui" line="67"/>
<source>TextLabel</source>
<translation>Tekstisilt</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="311"/>
+ <location filename="../src/gui/activitywidget.cpp" line="133"/>
<source>Server Activities</source>
<translation>Serveri tegevused</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="284"/>
+ <location filename="../src/gui/activitywidget.cpp" line="88"/>
<source>Copy</source>
<translation>Kopeeri</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="285"/>
+ <location filename="../src/gui/activitywidget.cpp" line="89"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Kopeeri tegevuste nimistu puhvrisse.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="318"/>
+ <location filename="../src/gui/activitywidget.cpp" line="137"/>
+ <source>Action Required: Notifications</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="142"/>
<source><br/>Account %1 does not have activities enabled.</source>
<translation type="unfinished"/>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="334"/>
+ <source>You received %n new notification(s) from %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="342"/>
+ <source>You received %n new notification(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="344"/>
+ <source>You received new notifications from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="348"/>
+ <source>%1 Notifications - Action Required</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
@@ -1457,6 +1506,31 @@ Items where deletion is allowed will be deleted if they prevent a directory from
</message>
</context>
<context>
+ <name>OCC::NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="50"/>
+ <source>Created at %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="99"/>
+ <source>Closing in a few seconds...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="133"/>
+ <source>%1 request failed at %2</source>
+ <extracomment>The second parameter is a time, such as 'failed at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="139"/>
+ <source>'%1' selected at %2</source>
+ <extracomment>The second parameter is a time, such as 'selected at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::OCUpdater</name>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="103"/>
@@ -2183,22 +2257,22 @@ Selle kasutamine pole soovitatav.</translation>
<translation>Seaded</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="85"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="87"/>
<source>Activity</source>
<translation>Toimingud</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="93"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>General</source>
<translation>Üldine</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="99"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="102"/>
<source>Network</source>
<translation>Võrk</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="197"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="199"/>
<source>Account</source>
<translation>Konto</translation>
</message>
@@ -2743,18 +2817,18 @@ Selle kasutamine pole soovitatav.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="687"/>
+ <location filename="../src/libsync/syncengine.cpp" line="690"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1089"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1101"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1096"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1108"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
@@ -2844,69 +2918,69 @@ Selle kasutamine pole soovitatav.</translation>
<translation>Failinime kodeering pole kehtiv</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="632"/>
+ <location filename="../src/libsync/syncengine.cpp" line="635"/>
<source>Invalid characters, please rename "%1"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="721"/>
+ <location filename="../src/libsync/syncengine.cpp" line="724"/>
<source>Unable to initialize a sync journal.</source>
<translation>Ei suuda lähtestada sünkroniseeringu zurnaali.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="804"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Cannot open the sync journal</source>
<translation>Ei suuda avada sünkroniseeringu zurnaali</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="858"/>
+ <location filename="../src/libsync/syncengine.cpp" line="861"/>
<source>File name contains at least one invalid character</source>
<translation>Faili nimesonvähemalt üks keelatud märk</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1057"/>
- <location filename="../src/libsync/syncengine.cpp" line="1064"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1067"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>"Vali, mida sünkroniseerida" musta nimekirja tõttu vahele jäetud</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1083"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1128"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Pole lubatud üles laadida, kuna tegemist on ainult-loetava serveriga, taastan</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1133"/>
- <location filename="../src/libsync/syncengine.cpp" line="1153"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1145"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
<source>Not allowed to remove, restoring</source>
<translation>Eemaldamine pole lubatud, taastan</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1178"/>
<source>Local files and share folder removed.</source>
<translation>Kohalikud failid ja jagatud kaustad eemaldatud.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1221"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1233"/>
<source>Move not allowed, item restored</source>
<translation>Liigutamine pole lubatud, üksus taastatud</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1242"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Liigutamien pole võimalik kuna %1 on ainult lugemiseks</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the destination</source>
<translation>sihtkoht</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the source</source>
<translation>allikas</translation>
</message>
diff --git a/translations/client_eu.ts b/translations/client_eu.ts
index b132e7b..6fcd7bd 100644
--- a/translations/client_eu.ts
+++ b/translations/client_eu.ts
@@ -64,6 +64,29 @@
</message>
</context>
<context>
+ <name>NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="20"/>
+ <source>Form</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="56"/>
+ <source>Lorem ipsum dolor sit amet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="63"/>
+ <source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="83"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountSettings</name>
<message>
<location filename="../src/gui/accountsettings.ui" line="14"/>
@@ -323,53 +346,53 @@
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="414"/>
- <location filename="../src/gui/activitywidget.cpp" line="456"/>
+ <location filename="../src/gui/activitywidget.cpp" line="496"/>
+ <location filename="../src/gui/activitywidget.cpp" line="548"/>
<source>Server Activity</source>
<translation>Zerbitzariaren Jarduera</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="419"/>
+ <location filename="../src/gui/activitywidget.cpp" line="502"/>
<source>Sync Protocol</source>
<translation>Sinkronizazio protokoloa</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="425"/>
+ <location filename="../src/gui/activitywidget.cpp" line="508"/>
<source>List of ignored or erroneous files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="429"/>
+ <location filename="../src/gui/activitywidget.cpp" line="512"/>
<source>Copy</source>
<translation>Kopiatu</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="430"/>
+ <location filename="../src/gui/activitywidget.cpp" line="513"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Kopiatu jarduera zerrenda arbelara.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="435"/>
+ <location filename="../src/gui/activitywidget.cpp" line="518"/>
<source>Not Synced</source>
<translation>Sinkronizatu gabekoak</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="471"/>
+ <location filename="../src/gui/activitywidget.cpp" line="563"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="475"/>
+ <location filename="../src/gui/activitywidget.cpp" line="567"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="478"/>
+ <location filename="../src/gui/activitywidget.cpp" line="570"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="483"/>
+ <location filename="../src/gui/activitywidget.cpp" line="575"/>
<source>Copied to clipboard</source>
<translation>Arbelera kopiatua</translation>
</message>
@@ -383,30 +406,56 @@
</message>
<message>
<location filename="../src/gui/activitywidget.ui" line="20"/>
- <location filename="../src/gui/activitywidget.ui" line="30"/>
+ <location filename="../src/gui/activitywidget.ui" line="50"/>
+ <location filename="../src/gui/activitywidget.ui" line="67"/>
<source>TextLabel</source>
<translation>TestuEtiketa</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="311"/>
+ <location filename="../src/gui/activitywidget.cpp" line="133"/>
<source>Server Activities</source>
<translation>Zerbitzariaren Jarduerak</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="284"/>
+ <location filename="../src/gui/activitywidget.cpp" line="88"/>
<source>Copy</source>
<translation>Kopiatu</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="285"/>
+ <location filename="../src/gui/activitywidget.cpp" line="89"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Kopiatu jarduera zerrenda arbelara.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="318"/>
+ <location filename="../src/gui/activitywidget.cpp" line="137"/>
+ <source>Action Required: Notifications</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="142"/>
<source><br/>Account %1 does not have activities enabled.</source>
<translation><br/>%1 kontuak ez ditu jarduerak gaituta.</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="334"/>
+ <source>You received %n new notification(s) from %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="342"/>
+ <source>You received %n new notification(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="344"/>
+ <source>You received new notifications from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="348"/>
+ <source>%1 Notifications - Action Required</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
@@ -1463,6 +1512,31 @@ Ezabatzeko baimena duten itemak ezabatuko dira hauek karpeta bat ezabatzea uzten
</message>
</context>
<context>
+ <name>OCC::NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="50"/>
+ <source>Created at %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="99"/>
+ <source>Closing in a few seconds...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="133"/>
+ <source>%1 request failed at %2</source>
+ <extracomment>The second parameter is a time, such as 'failed at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="139"/>
+ <source>'%1' selected at %2</source>
+ <extracomment>The second parameter is a time, such as 'selected at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::OCUpdater</name>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="103"/>
@@ -2189,22 +2263,22 @@ Ez da gomendagarria erabltzea.</translation>
<translation>Ezarpenak</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="85"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="87"/>
<source>Activity</source>
<translation>Jarduera</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="93"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>General</source>
<translation>Orokorra</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="99"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="102"/>
<source>Network</source>
<translation>Sarea</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="197"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="199"/>
<source>Account</source>
<translation>Kontua</translation>
</message>
@@ -2747,18 +2821,18 @@ Ez da gomendagarria erabltzea.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="687"/>
+ <location filename="../src/libsync/syncengine.cpp" line="690"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1089"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1101"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1096"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1108"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
@@ -2848,69 +2922,69 @@ Ez da gomendagarria erabltzea.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="632"/>
+ <location filename="../src/libsync/syncengine.cpp" line="635"/>
<source>Invalid characters, please rename "%1"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="721"/>
+ <location filename="../src/libsync/syncengine.cpp" line="724"/>
<source>Unable to initialize a sync journal.</source>
<translation>Ezin izan da sinkronizazio egunerokoa hasieratu.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="804"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Cannot open the sync journal</source>
<translation>Ezin da sinkronizazio egunerokoa ireki</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="858"/>
+ <location filename="../src/libsync/syncengine.cpp" line="861"/>
<source>File name contains at least one invalid character</source>
<translation>Fitxategi izenak behintzat baliogabeko karaktere bat du</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1057"/>
- <location filename="../src/libsync/syncengine.cpp" line="1064"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1067"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1083"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1128"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1133"/>
- <location filename="../src/libsync/syncengine.cpp" line="1153"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1145"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
<source>Not allowed to remove, restoring</source>
<translation>Ezabatzeko baimenik gabe, berrezartzen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1178"/>
<source>Local files and share folder removed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1221"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1233"/>
<source>Move not allowed, item restored</source>
<translation>Mugitzea ez dago baimenduta, elementua berrezarri da</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1242"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Mugitzea ez dago baimenduta %1 irakurtzeko bakarrik delako</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the destination</source>
<translation>helburua</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the source</source>
<translation>jatorria</translation>
</message>
diff --git a/translations/client_fa.ts b/translations/client_fa.ts
index 6b93c03..ff3d5f6 100644
--- a/translations/client_fa.ts
+++ b/translations/client_fa.ts
@@ -64,6 +64,29 @@
</message>
</context>
<context>
+ <name>NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="20"/>
+ <source>Form</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="56"/>
+ <source>Lorem ipsum dolor sit amet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="63"/>
+ <source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="83"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountSettings</name>
<message>
<location filename="../src/gui/accountsettings.ui" line="14"/>
@@ -323,53 +346,53 @@
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="414"/>
- <location filename="../src/gui/activitywidget.cpp" line="456"/>
+ <location filename="../src/gui/activitywidget.cpp" line="496"/>
+ <location filename="../src/gui/activitywidget.cpp" line="548"/>
<source>Server Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="419"/>
+ <location filename="../src/gui/activitywidget.cpp" line="502"/>
<source>Sync Protocol</source>
<translation>پروتکل همگام سازی</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="425"/>
+ <location filename="../src/gui/activitywidget.cpp" line="508"/>
<source>List of ignored or erroneous files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="429"/>
+ <location filename="../src/gui/activitywidget.cpp" line="512"/>
<source>Copy</source>
<translation>کپی کردن</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="430"/>
+ <location filename="../src/gui/activitywidget.cpp" line="513"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="435"/>
+ <location filename="../src/gui/activitywidget.cpp" line="518"/>
<source>Not Synced</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="471"/>
+ <location filename="../src/gui/activitywidget.cpp" line="563"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="475"/>
+ <location filename="../src/gui/activitywidget.cpp" line="567"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="478"/>
+ <location filename="../src/gui/activitywidget.cpp" line="570"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="483"/>
+ <location filename="../src/gui/activitywidget.cpp" line="575"/>
<source>Copied to clipboard</source>
<translation>کپی به کلیپ بورد</translation>
</message>
@@ -383,30 +406,56 @@
</message>
<message>
<location filename="../src/gui/activitywidget.ui" line="20"/>
- <location filename="../src/gui/activitywidget.ui" line="30"/>
+ <location filename="../src/gui/activitywidget.ui" line="50"/>
+ <location filename="../src/gui/activitywidget.ui" line="67"/>
<source>TextLabel</source>
<translation>برچسب متنی</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="311"/>
+ <location filename="../src/gui/activitywidget.cpp" line="133"/>
<source>Server Activities</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="284"/>
+ <location filename="../src/gui/activitywidget.cpp" line="88"/>
<source>Copy</source>
<translation>کپی کردن</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="285"/>
+ <location filename="../src/gui/activitywidget.cpp" line="89"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="318"/>
+ <location filename="../src/gui/activitywidget.cpp" line="137"/>
+ <source>Action Required: Notifications</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="142"/>
<source><br/>Account %1 does not have activities enabled.</source>
<translation type="unfinished"/>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="334"/>
+ <source>You received %n new notification(s) from %2.</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="342"/>
+ <source>You received %n new notification(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="344"/>
+ <source>You received new notifications from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="348"/>
+ <source>%1 Notifications - Action Required</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
@@ -1457,6 +1506,31 @@ Items where deletion is allowed will be deleted if they prevent a directory from
</message>
</context>
<context>
+ <name>OCC::NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="50"/>
+ <source>Created at %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="99"/>
+ <source>Closing in a few seconds...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="133"/>
+ <source>%1 request failed at %2</source>
+ <extracomment>The second parameter is a time, such as 'failed at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="139"/>
+ <source>'%1' selected at %2</source>
+ <extracomment>The second parameter is a time, such as 'selected at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::OCUpdater</name>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="103"/>
@@ -2182,22 +2256,22 @@ It is not advisable to use it.</source>
<translation>تنظیمات</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="85"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="87"/>
<source>Activity</source>
<translation>فعالیت</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="93"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>General</source>
<translation>عمومی</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="99"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="102"/>
<source>Network</source>
<translation>شبکه</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="197"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="199"/>
<source>Account</source>
<translation>حساب کاربری</translation>
</message>
@@ -2740,18 +2814,18 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="687"/>
+ <location filename="../src/libsync/syncengine.cpp" line="690"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1089"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1101"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1096"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1108"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
@@ -2841,69 +2915,69 @@ It is not advisable to use it.</source>
<translation>رمزگذاری نام فایل معتبر نیست</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="632"/>
+ <location filename="../src/libsync/syncengine.cpp" line="635"/>
<source>Invalid characters, please rename "%1"</source>
<translation>کاراکتر نامعتبر، لطفا "%1" را تغییر نام دهید</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="721"/>
+ <location filename="../src/libsync/syncengine.cpp" line="724"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="804"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="858"/>
+ <location filename="../src/libsync/syncengine.cpp" line="861"/>
<source>File name contains at least one invalid character</source>
<translation>نام فایل دارای حداقل یک کاراکتر نامعتبر است</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1057"/>
- <location filename="../src/libsync/syncengine.cpp" line="1064"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1067"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1083"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>با توجه به عدم اجازهی شما به ایجاد زیرپوشه به پوشه مجاز نیست</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1128"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>آپلود این فایل با توجه به فقط-خواندنی بودن آن در سرور مجاز نیست، در حال بازگرداندن</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1133"/>
- <location filename="../src/libsync/syncengine.cpp" line="1153"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1145"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
<source>Not allowed to remove, restoring</source>
<translation>حذف مجاز نیست، در حال بازگردادن</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1178"/>
<source>Local files and share folder removed.</source>
<translation>فایلهای محلی و پوشهی اشتراک حذف شد.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1221"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1233"/>
<source>Move not allowed, item restored</source>
<translation>انتقال مجاز نیست، مورد بازگردانده شد</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1242"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the destination</source>
<translation>مقصد</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the source</source>
<translation>مبدا</translation>
</message>
diff --git a/translations/client_fi.ts b/translations/client_fi.ts
index c5967e6..e234241 100644
--- a/translations/client_fi.ts
+++ b/translations/client_fi.ts
@@ -64,6 +64,29 @@
</message>
</context>
<context>
+ <name>NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="20"/>
+ <source>Form</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="56"/>
+ <source>Lorem ipsum dolor sit amet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="63"/>
+ <source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="83"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountSettings</name>
<message>
<location filename="../src/gui/accountsettings.ui" line="14"/>
@@ -323,53 +346,53 @@
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="414"/>
- <location filename="../src/gui/activitywidget.cpp" line="456"/>
+ <location filename="../src/gui/activitywidget.cpp" line="496"/>
+ <location filename="../src/gui/activitywidget.cpp" line="548"/>
<source>Server Activity</source>
<translation>Palvelimen toimet</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="419"/>
+ <location filename="../src/gui/activitywidget.cpp" line="502"/>
<source>Sync Protocol</source>
<translation>Synkronointiprotokolla</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="425"/>
+ <location filename="../src/gui/activitywidget.cpp" line="508"/>
<source>List of ignored or erroneous files</source>
<translation>Luettelo ohitettavista tai virheellisistä tiedostoista</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="429"/>
+ <location filename="../src/gui/activitywidget.cpp" line="512"/>
<source>Copy</source>
<translation>Kopioi</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="430"/>
+ <location filename="../src/gui/activitywidget.cpp" line="513"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Kopioi toimilista leikepöydälle.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="435"/>
+ <location filename="../src/gui/activitywidget.cpp" line="518"/>
<source>Not Synced</source>
<translation>Ei synkronoitu</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="471"/>
+ <location filename="../src/gui/activitywidget.cpp" line="563"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="475"/>
+ <location filename="../src/gui/activitywidget.cpp" line="567"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="478"/>
+ <location filename="../src/gui/activitywidget.cpp" line="570"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="483"/>
+ <location filename="../src/gui/activitywidget.cpp" line="575"/>
<source>Copied to clipboard</source>
<translation>Kopioitu leikepöydälle</translation>
</message>
@@ -383,30 +406,56 @@
</message>
<message>
<location filename="../src/gui/activitywidget.ui" line="20"/>
- <location filename="../src/gui/activitywidget.ui" line="30"/>
+ <location filename="../src/gui/activitywidget.ui" line="50"/>
+ <location filename="../src/gui/activitywidget.ui" line="67"/>
<source>TextLabel</source>
<translation>TekstiLeima</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="311"/>
+ <location filename="../src/gui/activitywidget.cpp" line="133"/>
<source>Server Activities</source>
<translation>Palvelimen toimet</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="284"/>
+ <location filename="../src/gui/activitywidget.cpp" line="88"/>
<source>Copy</source>
<translation>Kopioi</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="285"/>
+ <location filename="../src/gui/activitywidget.cpp" line="89"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Kopioi toimilista leikepöydälle.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="318"/>
+ <location filename="../src/gui/activitywidget.cpp" line="137"/>
+ <source>Action Required: Notifications</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="142"/>
<source><br/>Account %1 does not have activities enabled.</source>
<translation><br/>Tilillä %1 ei ole toimia käytössä.</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="334"/>
+ <source>You received %n new notification(s) from %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="342"/>
+ <source>You received %n new notification(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="344"/>
+ <source>You received new notifications from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="348"/>
+ <source>%1 Notifications - Action Required</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
@@ -1464,6 +1513,31 @@ Kohteet, joiden poisto on sallittu, poistetaan, jos ne estävät kansion poistam
</message>
</context>
<context>
+ <name>OCC::NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="50"/>
+ <source>Created at %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="99"/>
+ <source>Closing in a few seconds...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="133"/>
+ <source>%1 request failed at %2</source>
+ <extracomment>The second parameter is a time, such as 'failed at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="139"/>
+ <source>'%1' selected at %2</source>
+ <extracomment>The second parameter is a time, such as 'selected at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::OCUpdater</name>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="103"/>
@@ -2190,22 +2264,22 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<translation>Asetukset</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="85"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="87"/>
<source>Activity</source>
<translation>Toimet</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="93"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>General</source>
<translation>Yleiset</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="99"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="102"/>
<source>Network</source>
<translation>Verkko</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="197"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="199"/>
<source>Account</source>
<translation>Tili</translation>
</message>
@@ -2750,18 +2824,18 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="687"/>
+ <location filename="../src/libsync/syncengine.cpp" line="690"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Vain %1 on käytettävissä, käynnistymiseen tarvitaan %2</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1089"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1101"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Ei sallittu, koska käyttöoikeutesi eivät riitä ylätason kansion lisäämiseen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1096"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1108"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Ei sallittu, koska käyttöoikeutesi eivät riitä tiedostojen lisäämiseen kyseiseen kansioon</translation>
</message>
@@ -2851,69 +2925,69 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<translation>Tiedostonimen merkistökoodaus ei ole kelvollista</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="632"/>
+ <location filename="../src/libsync/syncengine.cpp" line="635"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Virheellisiä merkkejä, anna uusi nimi kohteelle "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="721"/>
+ <location filename="../src/libsync/syncengine.cpp" line="724"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="804"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="858"/>
+ <location filename="../src/libsync/syncengine.cpp" line="861"/>
<source>File name contains at least one invalid character</source>
<translation>Tiedoston nimi sisältää ainakin yhden virheellisen merkin</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1057"/>
- <location filename="../src/libsync/syncengine.cpp" line="1064"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1067"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1083"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Ei sallittu, koska oikeutesi eivät riitä alikansioiden lisäämiseen kyseiseen kansioon</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1128"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1133"/>
- <location filename="../src/libsync/syncengine.cpp" line="1153"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1145"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
<source>Not allowed to remove, restoring</source>
<translation>Poistaminen ei ole sallittua, palautetaan</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1178"/>
<source>Local files and share folder removed.</source>
<translation>Paikalliset tiedostot ja jakokansio poistettu.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1221"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1233"/>
<source>Move not allowed, item restored</source>
<translation>Siirtäminen ei ole sallittua, kohde palautettu</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1242"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Siirto ei ole sallittu, koska %1 on "vain luku"-tilassa</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the destination</source>
<translation>kohde</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the source</source>
<translation>lähde</translation>
</message>
diff --git a/translations/client_fr.ts b/translations/client_fr.ts
index 0e7d4e1..d13c407 100644
--- a/translations/client_fr.ts
+++ b/translations/client_fr.ts
@@ -64,6 +64,29 @@
</message>
</context>
<context>
+ <name>NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="20"/>
+ <source>Form</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="56"/>
+ <source>Lorem ipsum dolor sit amet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="63"/>
+ <source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="83"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountSettings</name>
<message>
<location filename="../src/gui/accountsettings.ui" line="14"/>
@@ -323,53 +346,53 @@
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="414"/>
- <location filename="../src/gui/activitywidget.cpp" line="456"/>
+ <location filename="../src/gui/activitywidget.cpp" line="496"/>
+ <location filename="../src/gui/activitywidget.cpp" line="548"/>
<source>Server Activity</source>
<translation>Activité du serveur</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="419"/>
+ <location filename="../src/gui/activitywidget.cpp" line="502"/>
<source>Sync Protocol</source>
<translation>Protocole de synchronisation</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="425"/>
+ <location filename="../src/gui/activitywidget.cpp" line="508"/>
<source>List of ignored or erroneous files</source>
<translation>Liste des fichiers ignorés ou en erreur</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="429"/>
+ <location filename="../src/gui/activitywidget.cpp" line="512"/>
<source>Copy</source>
<translation>Copier</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="430"/>
+ <location filename="../src/gui/activitywidget.cpp" line="513"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Copier la liste d'activités dans le presse-papier.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="435"/>
+ <location filename="../src/gui/activitywidget.cpp" line="518"/>
<source>Not Synced</source>
<translation>Fichiers non synchronisés</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="471"/>
+ <location filename="../src/gui/activitywidget.cpp" line="563"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation>La liste des activités du serveur a été copiée dans le presse-papier.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="475"/>
+ <location filename="../src/gui/activitywidget.cpp" line="567"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation>La liste des activités de synchronisation a été copiée dans le presse-papier.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="478"/>
+ <location filename="../src/gui/activitywidget.cpp" line="570"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation>La liste des éléments non synchronisés a été copiée dans le presse-papier.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="483"/>
+ <location filename="../src/gui/activitywidget.cpp" line="575"/>
<source>Copied to clipboard</source>
<translation>Copié dans le presse-papier</translation>
</message>
@@ -383,30 +406,56 @@
</message>
<message>
<location filename="../src/gui/activitywidget.ui" line="20"/>
- <location filename="../src/gui/activitywidget.ui" line="30"/>
+ <location filename="../src/gui/activitywidget.ui" line="50"/>
+ <location filename="../src/gui/activitywidget.ui" line="67"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="311"/>
+ <location filename="../src/gui/activitywidget.cpp" line="133"/>
<source>Server Activities</source>
<translation>Activités Serveur</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="284"/>
+ <location filename="../src/gui/activitywidget.cpp" line="88"/>
<source>Copy</source>
<translation>Copier</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="285"/>
+ <location filename="../src/gui/activitywidget.cpp" line="89"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Copier la liste d'activités dans le presse-papier.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="318"/>
+ <location filename="../src/gui/activitywidget.cpp" line="137"/>
+ <source>Action Required: Notifications</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="142"/>
<source><br/>Account %1 does not have activities enabled.</source>
<translation><br/>Le compte %1 n'a aucune activité activée.</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="334"/>
+ <source>You received %n new notification(s) from %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="342"/>
+ <source>You received %n new notification(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="344"/>
+ <source>You received new notifications from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="348"/>
+ <source>%1 Notifications - Action Required</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
@@ -1468,6 +1517,31 @@ Les éléments dont la suppression automatique est permise seront supprimés s&a
</message>
</context>
<context>
+ <name>OCC::NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="50"/>
+ <source>Created at %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="99"/>
+ <source>Closing in a few seconds...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="133"/>
+ <source>%1 request failed at %2</source>
+ <extracomment>The second parameter is a time, such as 'failed at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="139"/>
+ <source>'%1' selected at %2</source>
+ <extracomment>The second parameter is a time, such as 'selected at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::OCUpdater</name>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="103"/>
@@ -2201,22 +2275,22 @@ Il est déconseillé de l'utiliser.</translation>
<translation>Paramètres</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="85"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="87"/>
<source>Activity</source>
<translation>Activité</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="93"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>General</source>
<translation>Généraux</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="99"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="102"/>
<source>Network</source>
<translation>Réseau</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="197"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="199"/>
<source>Account</source>
<translation>Compte</translation>
</message>
@@ -2761,18 +2835,18 @@ Il est déconseillé de l'utiliser.</translation>
<translation>Le fichier/dossier est ignoré car il est caché.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="687"/>
+ <location filename="../src/libsync/syncengine.cpp" line="690"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Seulement %1 disponibles, il faut au moins %2 pour démarrer</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1089"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1101"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Non autorisé car vous n'avez pas la permission d'ajouter un dossier parent</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1096"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1108"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Non autorisé car vous n'avez pas la permission d'ajouter des fichiers dans ce dossier</translation>
</message>
@@ -2862,69 +2936,69 @@ Il est déconseillé de l'utiliser.</translation>
<translation>L'encodage du nom de fichier n'est pas valide</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="632"/>
+ <location filename="../src/libsync/syncengine.cpp" line="635"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Caractères non valides. Veuillez renommer "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="721"/>
+ <location filename="../src/libsync/syncengine.cpp" line="724"/>
<source>Unable to initialize a sync journal.</source>
<translation>Impossible d'initialiser un journal de synchronisation.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="804"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Cannot open the sync journal</source>
<translation>Impossible d'ouvrir le journal de synchronisation</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="858"/>
+ <location filename="../src/libsync/syncengine.cpp" line="861"/>
<source>File name contains at least one invalid character</source>
<translation>Le nom de fichier contient au moins un caractère non valable</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1057"/>
- <location filename="../src/libsync/syncengine.cpp" line="1064"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1067"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignoré à cause de la liste noire "Choisir le contenu à synchroniser".</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1083"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Non autorisé car vous n'avez pas la permission d'ajouter des sous-dossiers dans ce dossier</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1128"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Non autorisé à envoyer ce fichier car il est en lecture seule sur le serveur. Restauration</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1133"/>
- <location filename="../src/libsync/syncengine.cpp" line="1153"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1145"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
<source>Not allowed to remove, restoring</source>
<translation>Non autorisé à supprimer. Restauration</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1178"/>
<source>Local files and share folder removed.</source>
<translation>Fichiers locaux et répertoire de partage supprimés.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1221"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1233"/>
<source>Move not allowed, item restored</source>
<translation>Déplacement non autorisé, élément restauré</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1242"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Déplacement non autorisé car %1 est en mode lecture seule</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the destination</source>
<translation>la destination</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the source</source>
<translation>la source</translation>
</message>
diff --git a/translations/client_gl.ts b/translations/client_gl.ts
index 379579a..c531ebf 100644
--- a/translations/client_gl.ts
+++ b/translations/client_gl.ts
@@ -64,6 +64,29 @@
</message>
</context>
<context>
+ <name>NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="20"/>
+ <source>Form</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="56"/>
+ <source>Lorem ipsum dolor sit amet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="63"/>
+ <source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="83"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountSettings</name>
<message>
<location filename="../src/gui/accountsettings.ui" line="14"/>
@@ -323,53 +346,53 @@
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="414"/>
- <location filename="../src/gui/activitywidget.cpp" line="456"/>
+ <location filename="../src/gui/activitywidget.cpp" line="496"/>
+ <location filename="../src/gui/activitywidget.cpp" line="548"/>
<source>Server Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="419"/>
+ <location filename="../src/gui/activitywidget.cpp" line="502"/>
<source>Sync Protocol</source>
<translation>Protocolo de sincronización</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="425"/>
+ <location filename="../src/gui/activitywidget.cpp" line="508"/>
<source>List of ignored or erroneous files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="429"/>
+ <location filename="../src/gui/activitywidget.cpp" line="512"/>
<source>Copy</source>
<translation>Copiar</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="430"/>
+ <location filename="../src/gui/activitywidget.cpp" line="513"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Copiar a lista da actividade no portapapeis.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="435"/>
+ <location filename="../src/gui/activitywidget.cpp" line="518"/>
<source>Not Synced</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="471"/>
+ <location filename="../src/gui/activitywidget.cpp" line="563"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="475"/>
+ <location filename="../src/gui/activitywidget.cpp" line="567"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="478"/>
+ <location filename="../src/gui/activitywidget.cpp" line="570"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="483"/>
+ <location filename="../src/gui/activitywidget.cpp" line="575"/>
<source>Copied to clipboard</source>
<translation>Copiado no portapapeis.</translation>
</message>
@@ -383,30 +406,56 @@
</message>
<message>
<location filename="../src/gui/activitywidget.ui" line="20"/>
- <location filename="../src/gui/activitywidget.ui" line="30"/>
+ <location filename="../src/gui/activitywidget.ui" line="50"/>
+ <location filename="../src/gui/activitywidget.ui" line="67"/>
<source>TextLabel</source>
<translation>Etiqueta de texto</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="311"/>
+ <location filename="../src/gui/activitywidget.cpp" line="133"/>
<source>Server Activities</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="284"/>
+ <location filename="../src/gui/activitywidget.cpp" line="88"/>
<source>Copy</source>
<translation>Copiar</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="285"/>
+ <location filename="../src/gui/activitywidget.cpp" line="89"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Copiar a lista da actividade no portapapeis.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="318"/>
+ <location filename="../src/gui/activitywidget.cpp" line="137"/>
+ <source>Action Required: Notifications</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="142"/>
<source><br/>Account %1 does not have activities enabled.</source>
<translation type="unfinished"/>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="334"/>
+ <source>You received %n new notification(s) from %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="342"/>
+ <source>You received %n new notification(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="344"/>
+ <source>You received new notifications from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="348"/>
+ <source>%1 Notifications - Action Required</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
@@ -1462,6 +1511,31 @@ Items where deletion is allowed will be deleted if they prevent a directory from
</message>
</context>
<context>
+ <name>OCC::NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="50"/>
+ <source>Created at %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="99"/>
+ <source>Closing in a few seconds...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="133"/>
+ <source>%1 request failed at %2</source>
+ <extracomment>The second parameter is a time, such as 'failed at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="139"/>
+ <source>'%1' selected at %2</source>
+ <extracomment>The second parameter is a time, such as 'selected at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::OCUpdater</name>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="103"/>
@@ -2192,22 +2266,22 @@ Recomendámoslle que non o use.</translation>
<translation>Axustes</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="85"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="87"/>
<source>Activity</source>
<translation>Actividade</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="93"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>General</source>
<translation>Xeral</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="99"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="102"/>
<source>Network</source>
<translation>Rede</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="197"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="199"/>
<source>Account</source>
<translation>Conta</translation>
</message>
@@ -2752,18 +2826,18 @@ Recomendámoslle que non o use.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="687"/>
+ <location filename="../src/libsync/syncengine.cpp" line="690"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1089"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1101"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1096"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1108"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
@@ -2853,69 +2927,69 @@ Recomendámoslle que non o use.</translation>
<translation>O nome de ficheiro codificado non é correcto</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="632"/>
+ <location filename="../src/libsync/syncengine.cpp" line="635"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Caracteres incorrectos, déalle outro nome a «%1»</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="721"/>
+ <location filename="../src/libsync/syncengine.cpp" line="724"/>
<source>Unable to initialize a sync journal.</source>
<translation>Non é posíbel preparar un rexistro de sincronización.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="804"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Cannot open the sync journal</source>
<translation>Non foi posíbel abrir o rexistro de sincronización</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="858"/>
+ <location filename="../src/libsync/syncengine.cpp" line="861"/>
<source>File name contains at least one invalid character</source>
<translation>O nome de ficheiro contén algún carácter incorrecto</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1057"/>
- <location filename="../src/libsync/syncengine.cpp" line="1064"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1067"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignorado por mor da lista negra de «escolla que sincronizar»</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1083"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1128"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Non está permitido o envío xa que o ficheiro é só de lectura no servidor, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1133"/>
- <location filename="../src/libsync/syncengine.cpp" line="1153"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1145"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
<source>Not allowed to remove, restoring</source>
<translation>Non está permitido retiralo, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1178"/>
<source>Local files and share folder removed.</source>
<translation>Retirados os ficheiros locais e o cartafol compartido.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1221"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1233"/>
<source>Move not allowed, item restored</source>
<translation>Nos está permitido movelo, elemento restaurado</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1242"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Bon está permitido movelo xa que %1 é só de lectura</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the destination</source>
<translation>o destino</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the source</source>
<translation>a orixe</translation>
</message>
diff --git a/translations/client_hu.ts b/translations/client_hu.ts
index 7df2176..f1b8f20 100644
--- a/translations/client_hu.ts
+++ b/translations/client_hu.ts
@@ -64,6 +64,29 @@
</message>
</context>
<context>
+ <name>NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="20"/>
+ <source>Form</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="56"/>
+ <source>Lorem ipsum dolor sit amet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="63"/>
+ <source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="83"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountSettings</name>
<message>
<location filename="../src/gui/accountsettings.ui" line="14"/>
@@ -323,53 +346,53 @@
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="414"/>
- <location filename="../src/gui/activitywidget.cpp" line="456"/>
+ <location filename="../src/gui/activitywidget.cpp" line="496"/>
+ <location filename="../src/gui/activitywidget.cpp" line="548"/>
<source>Server Activity</source>
<translation>Szerver aktivitás</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="419"/>
+ <location filename="../src/gui/activitywidget.cpp" line="502"/>
<source>Sync Protocol</source>
<translation>Szinkronizációs protokoll</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="425"/>
+ <location filename="../src/gui/activitywidget.cpp" line="508"/>
<source>List of ignored or erroneous files</source>
<translation>Kihagyott vagy hibás fájlok listázása</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="429"/>
+ <location filename="../src/gui/activitywidget.cpp" line="512"/>
<source>Copy</source>
<translation>Másolás</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="430"/>
+ <location filename="../src/gui/activitywidget.cpp" line="513"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Az aktivitási lista másolása a vágólapra.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="435"/>
+ <location filename="../src/gui/activitywidget.cpp" line="518"/>
<source>Not Synced</source>
<translation>Nincs szinkronizálva</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="471"/>
+ <location filename="../src/gui/activitywidget.cpp" line="563"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation>A szerver aktivitási lista a vágólapra másolva.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="475"/>
+ <location filename="../src/gui/activitywidget.cpp" line="567"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation>A szinkronizációs aktivitási lista a vágólapra másolva.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="478"/>
+ <location filename="../src/gui/activitywidget.cpp" line="570"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation>A nem szinkronizált elemek a vágólapra másolva.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="483"/>
+ <location filename="../src/gui/activitywidget.cpp" line="575"/>
<source>Copied to clipboard</source>
<translation>Másolva a vágólapra</translation>
</message>
@@ -383,30 +406,56 @@
</message>
<message>
<location filename="../src/gui/activitywidget.ui" line="20"/>
- <location filename="../src/gui/activitywidget.ui" line="30"/>
+ <location filename="../src/gui/activitywidget.ui" line="50"/>
+ <location filename="../src/gui/activitywidget.ui" line="67"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="311"/>
+ <location filename="../src/gui/activitywidget.cpp" line="133"/>
<source>Server Activities</source>
<translation>Szerver aktivitások</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="284"/>
+ <location filename="../src/gui/activitywidget.cpp" line="88"/>
<source>Copy</source>
<translation>Másolás</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="285"/>
+ <location filename="../src/gui/activitywidget.cpp" line="89"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Aktivitási lista másolása a vágólapra.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="318"/>
+ <location filename="../src/gui/activitywidget.cpp" line="137"/>
+ <source>Action Required: Notifications</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="142"/>
<source><br/>Account %1 does not have activities enabled.</source>
<translation><br /> %1 fióknak nincsenek engedélyezve az aktivitások.</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="334"/>
+ <source>You received %n new notification(s) from %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="342"/>
+ <source>You received %n new notification(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="344"/>
+ <source>You received new notifications from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="348"/>
+ <source>%1 Notifications - Action Required</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
@@ -1461,6 +1510,31 @@ Items where deletion is allowed will be deleted if they prevent a directory from
</message>
</context>
<context>
+ <name>OCC::NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="50"/>
+ <source>Created at %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="99"/>
+ <source>Closing in a few seconds...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="133"/>
+ <source>%1 request failed at %2</source>
+ <extracomment>The second parameter is a time, such as 'failed at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="139"/>
+ <source>'%1' selected at %2</source>
+ <extracomment>The second parameter is a time, such as 'selected at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::OCUpdater</name>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="103"/>
@@ -2186,22 +2260,22 @@ It is not advisable to use it.</source>
<translation>Beállítások</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="85"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="87"/>
<source>Activity</source>
<translation>Aktivitás</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="93"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>General</source>
<translation>Általános</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="99"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="102"/>
<source>Network</source>
<translation>Hálózat</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="197"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="199"/>
<source>Account</source>
<translation>Fiók</translation>
</message>
@@ -2745,18 +2819,18 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="687"/>
+ <location filename="../src/libsync/syncengine.cpp" line="690"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1089"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1101"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1096"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1108"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
@@ -2846,69 +2920,69 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="632"/>
+ <location filename="../src/libsync/syncengine.cpp" line="635"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Érvénytelen karakterek, kérjük nevezd át: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="721"/>
+ <location filename="../src/libsync/syncengine.cpp" line="724"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="804"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="858"/>
+ <location filename="../src/libsync/syncengine.cpp" line="861"/>
<source>File name contains at least one invalid character</source>
<translation>A fájlnév legalább egy érvénytelen karaktert tartalmaz!</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1057"/>
- <location filename="../src/libsync/syncengine.cpp" line="1064"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1067"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1083"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1128"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1133"/>
- <location filename="../src/libsync/syncengine.cpp" line="1153"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1145"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1178"/>
<source>Local files and share folder removed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1221"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1233"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1242"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the destination</source>
<translation>a cél</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the source</source>
<translation>a forrás</translation>
</message>
diff --git a/translations/client_it.ts b/translations/client_it.ts
index 24ec153..01a3c07 100644
--- a/translations/client_it.ts
+++ b/translations/client_it.ts
@@ -64,6 +64,29 @@
</message>
</context>
<context>
+ <name>NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="20"/>
+ <source>Form</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="56"/>
+ <source>Lorem ipsum dolor sit amet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="63"/>
+ <source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="83"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountSettings</name>
<message>
<location filename="../src/gui/accountsettings.ui" line="14"/>
@@ -323,53 +346,53 @@
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="414"/>
- <location filename="../src/gui/activitywidget.cpp" line="456"/>
+ <location filename="../src/gui/activitywidget.cpp" line="496"/>
+ <location filename="../src/gui/activitywidget.cpp" line="548"/>
<source>Server Activity</source>
<translation>Attività del server</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="419"/>
+ <location filename="../src/gui/activitywidget.cpp" line="502"/>
<source>Sync Protocol</source>
<translation>Protocollo di sincronizzazione</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="425"/>
+ <location filename="../src/gui/activitywidget.cpp" line="508"/>
<source>List of ignored or erroneous files</source>
<translation>Elenco dei file ignorati o errati</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="429"/>
+ <location filename="../src/gui/activitywidget.cpp" line="512"/>
<source>Copy</source>
<translation>Copia</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="430"/>
+ <location filename="../src/gui/activitywidget.cpp" line="513"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Copia l'elenco delle attività negli appunti.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="435"/>
+ <location filename="../src/gui/activitywidget.cpp" line="518"/>
<source>Not Synced</source>
<translation>Non sincronizzata</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="471"/>
+ <location filename="../src/gui/activitywidget.cpp" line="563"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation>L'elenco di attività del server è stato copiato negli appunti.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="475"/>
+ <location filename="../src/gui/activitywidget.cpp" line="567"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation>L'elenco di attività di sincronizzazione è stato copiato negli appunti.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="478"/>
+ <location filename="../src/gui/activitywidget.cpp" line="570"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation>L'elenco di elementi non sincronizzati è stato copiato negli appunti.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="483"/>
+ <location filename="../src/gui/activitywidget.cpp" line="575"/>
<source>Copied to clipboard</source>
<translation>Copiato negli appunti</translation>
</message>
@@ -383,30 +406,56 @@
</message>
<message>
<location filename="../src/gui/activitywidget.ui" line="20"/>
- <location filename="../src/gui/activitywidget.ui" line="30"/>
+ <location filename="../src/gui/activitywidget.ui" line="50"/>
+ <location filename="../src/gui/activitywidget.ui" line="67"/>
<source>TextLabel</source>
<translation>EtichettaTesto</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="311"/>
+ <location filename="../src/gui/activitywidget.cpp" line="133"/>
<source>Server Activities</source>
<translation>Attività del server</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="284"/>
+ <location filename="../src/gui/activitywidget.cpp" line="88"/>
<source>Copy</source>
<translation>Copia</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="285"/>
+ <location filename="../src/gui/activitywidget.cpp" line="89"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Copia l'elenco delle attività negli appunti.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="318"/>
+ <location filename="../src/gui/activitywidget.cpp" line="137"/>
+ <source>Action Required: Notifications</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="142"/>
<source><br/>Account %1 does not have activities enabled.</source>
<translation><br/>L'account %1 non ha attività abilitate.</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="334"/>
+ <source>You received %n new notification(s) from %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="342"/>
+ <source>You received %n new notification(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="344"/>
+ <source>You received new notifications from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="348"/>
+ <source>%1 Notifications - Action Required</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
@@ -1468,6 +1517,31 @@ Gli elementi per i quali è consentita l'eliminazione, saranno eliminati se
</message>
</context>
<context>
+ <name>OCC::NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="50"/>
+ <source>Created at %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="99"/>
+ <source>Closing in a few seconds...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="133"/>
+ <source>%1 request failed at %2</source>
+ <extracomment>The second parameter is a time, such as 'failed at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="139"/>
+ <source>'%1' selected at %2</source>
+ <extracomment>The second parameter is a time, such as 'selected at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::OCUpdater</name>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="103"/>
@@ -2198,22 +2272,22 @@ Non è consigliabile utilizzarlo.</translation>
<translation>Impostazioni</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="85"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="87"/>
<source>Activity</source>
<translation>Attività</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="93"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>General</source>
<translation>Generale</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="99"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="102"/>
<source>Network</source>
<translation>Rete</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="197"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="199"/>
<source>Account</source>
<translation>Account</translation>
</message>
@@ -2758,18 +2832,18 @@ Non è consigliabile utilizzarlo.</translation>
<translation>Il file/cartella è ignorato poiché è nascosto.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="687"/>
+ <location filename="../src/libsync/syncengine.cpp" line="690"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Sono disponibili solo %1, servono almeno %2 per iniziare</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1089"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1101"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Non consentito poiché non disponi dei permessi per aggiungere la cartella superiore</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1096"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1108"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Non consentito poiché non disponi dei permessi per aggiungere file in quella cartella</translation>
</message>
@@ -2859,69 +2933,69 @@ Non è consigliabile utilizzarlo.</translation>
<translation>La codifica del nome del file non è valida</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="632"/>
+ <location filename="../src/libsync/syncengine.cpp" line="635"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Caratteri non validi, rinomina "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="721"/>
+ <location filename="../src/libsync/syncengine.cpp" line="724"/>
<source>Unable to initialize a sync journal.</source>
<translation>Impossibile inizializzare il registro di sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="804"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Cannot open the sync journal</source>
<translation>Impossibile aprire il registro di sincronizzazione</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="858"/>
+ <location filename="../src/libsync/syncengine.cpp" line="861"/>
<source>File name contains at least one invalid character</source>
<translation>Il nome del file contiene almeno un carattere non valido</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1057"/>
- <location filename="../src/libsync/syncengine.cpp" line="1064"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1067"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignorato in base alla lista nera per la scelta di cosa sincronizzare</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1083"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Non consentito poiché non disponi dei permessi per aggiungere sottocartelle in quella cartella</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1128"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Il caricamento di questo file non è consentito poiché è in sola lettura sul server, ripristino</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1133"/>
- <location filename="../src/libsync/syncengine.cpp" line="1153"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1145"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
<source>Not allowed to remove, restoring</source>
<translation>Rimozione non consentita, ripristino</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1178"/>
<source>Local files and share folder removed.</source>
<translation>I file locali e la cartella condivisa sono stati rimossi.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1221"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1233"/>
<source>Move not allowed, item restored</source>
<translation>Spostamento non consentito, elemento ripristinato</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1242"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Spostamento non consentito poiché %1 è in sola lettura</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the destination</source>
<translation>la destinazione</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the source</source>
<translation>l'origine</translation>
</message>
diff --git a/translations/client_ja.ts b/translations/client_ja.ts
index 565fa8c..36f34c0 100644
--- a/translations/client_ja.ts
+++ b/translations/client_ja.ts
@@ -64,6 +64,29 @@
</message>
</context>
<context>
+ <name>NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="20"/>
+ <source>Form</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="56"/>
+ <source>Lorem ipsum dolor sit amet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="63"/>
+ <source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="83"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountSettings</name>
<message>
<location filename="../src/gui/accountsettings.ui" line="14"/>
@@ -323,53 +346,53 @@
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="414"/>
- <location filename="../src/gui/activitywidget.cpp" line="456"/>
+ <location filename="../src/gui/activitywidget.cpp" line="496"/>
+ <location filename="../src/gui/activitywidget.cpp" line="548"/>
<source>Server Activity</source>
<translation>サーバーアクティビティ</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="419"/>
+ <location filename="../src/gui/activitywidget.cpp" line="502"/>
<source>Sync Protocol</source>
<translation>同期状況</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="425"/>
+ <location filename="../src/gui/activitywidget.cpp" line="508"/>
<source>List of ignored or erroneous files</source>
<translation>無視またはエラーになったファイルのリスト</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="429"/>
+ <location filename="../src/gui/activitywidget.cpp" line="512"/>
<source>Copy</source>
<translation>コピー</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="430"/>
+ <location filename="../src/gui/activitywidget.cpp" line="513"/>
<source>Copy the activity list to the clipboard.</source>
<translation>アクティビティ一覧をコピーする</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="435"/>
+ <location filename="../src/gui/activitywidget.cpp" line="518"/>
<source>Not Synced</source>
<translation>同期対象外</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="471"/>
+ <location filename="../src/gui/activitywidget.cpp" line="563"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation>サーバアクティビティリストをクリップボードにコピーしました。</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="475"/>
+ <location filename="../src/gui/activitywidget.cpp" line="567"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation>同期状況をクリップボードにコピーしました。</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="478"/>
+ <location filename="../src/gui/activitywidget.cpp" line="570"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation>非同期アイテムリストをクリップボードにコピーしました。</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="483"/>
+ <location filename="../src/gui/activitywidget.cpp" line="575"/>
<source>Copied to clipboard</source>
<translation>クリップボードにコピー</translation>
</message>
@@ -383,30 +406,56 @@
</message>
<message>
<location filename="../src/gui/activitywidget.ui" line="20"/>
- <location filename="../src/gui/activitywidget.ui" line="30"/>
+ <location filename="../src/gui/activitywidget.ui" line="50"/>
+ <location filename="../src/gui/activitywidget.ui" line="67"/>
<source>TextLabel</source>
<translation>テキストラベル</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="311"/>
+ <location filename="../src/gui/activitywidget.cpp" line="133"/>
<source>Server Activities</source>
<translation>サーバーアクティビティ</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="284"/>
+ <location filename="../src/gui/activitywidget.cpp" line="88"/>
<source>Copy</source>
<translation>コピー</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="285"/>
+ <location filename="../src/gui/activitywidget.cpp" line="89"/>
<source>Copy the activity list to the clipboard.</source>
<translation>アクティビティ一覧をコピーする</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="318"/>
+ <location filename="../src/gui/activitywidget.cpp" line="137"/>
+ <source>Action Required: Notifications</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="142"/>
<source><br/>Account %1 does not have activities enabled.</source>
<translation><br/>%1 アカウントは、 アクティビティを有効にしていません。</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="334"/>
+ <source>You received %n new notification(s) from %2.</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="342"/>
+ <source>You received %n new notification(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="344"/>
+ <source>You received new notifications from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="348"/>
+ <source>%1 Notifications - Action Required</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
@@ -1468,6 +1517,31 @@ Items where deletion is allowed will be deleted if they prevent a directory from
</message>
</context>
<context>
+ <name>OCC::NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="50"/>
+ <source>Created at %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="99"/>
+ <source>Closing in a few seconds...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="133"/>
+ <source>%1 request failed at %2</source>
+ <extracomment>The second parameter is a time, such as 'failed at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="139"/>
+ <source>'%1' selected at %2</source>
+ <extracomment>The second parameter is a time, such as 'selected at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::OCUpdater</name>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="103"/>
@@ -2195,22 +2269,22 @@ It is not advisable to use it.</source>
<translation>設定</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="85"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="87"/>
<source>Activity</source>
<translation>アクティビティ</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="93"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>General</source>
<translation>一般</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="99"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="102"/>
<source>Network</source>
<translation>ネットワーク</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="197"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="199"/>
<source>Account</source>
<translation>アカウント</translation>
</message>
@@ -2755,18 +2829,18 @@ It is not advisable to use it.</source>
<translation>隠しファイル/フォルダのため無視されました</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="687"/>
+ <location filename="../src/libsync/syncengine.cpp" line="690"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>%1 しか空き容量がありません、開始するためには少なくとも %2 は必要です。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1089"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1101"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>親フォルダーを追加する権限がありません</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1096"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1108"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>そのフォルダーにファイルを追加する権限がありません</translation>
</message>
@@ -2856,69 +2930,69 @@ It is not advisable to use it.</source>
<translation>ファイル名のエンコーディングが無効です。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="632"/>
+ <location filename="../src/libsync/syncengine.cpp" line="635"/>
<source>Invalid characters, please rename "%1"</source>
<translation>無効な文字です、"%1" を変更してください。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="721"/>
+ <location filename="../src/libsync/syncengine.cpp" line="724"/>
<source>Unable to initialize a sync journal.</source>
<translation>同期ジャーナルの初期化ができません。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="804"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Cannot open the sync journal</source>
<translation>同期ジャーナルを開くことができません</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="858"/>
+ <location filename="../src/libsync/syncengine.cpp" line="861"/>
<source>File name contains at least one invalid character</source>
<translation>ファイル名に1文字以上の無効な文字が含まれています</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1057"/>
- <location filename="../src/libsync/syncengine.cpp" line="1064"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1067"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>"同期対象先" ブラックリストにより無視されました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1083"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>そのフォルダーにサブフォルダーを追加する権限がありません</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1128"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>サーバーでは読み取り専用となっているため、このファイルをアップロードすることはできません、復元しています</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1133"/>
- <location filename="../src/libsync/syncengine.cpp" line="1153"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1145"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
<source>Not allowed to remove, restoring</source>
<translation>削除できないので復元しています</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1178"/>
<source>Local files and share folder removed.</source>
<translation>ローカルファイルと共有フォルダーを削除しました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1221"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1233"/>
<source>Move not allowed, item restored</source>
<translation>移動できないので項目を復元しました</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1242"/>
<source>Move not allowed because %1 is read-only</source>
<translation>%1 は読み取り専用のため移動できません</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the destination</source>
<translation>移動先</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the source</source>
<translation>移動元</translation>
</message>
diff --git a/translations/client_nb_NO.ts b/translations/client_nb_NO.ts
index 407e6fe..a29b9e3 100644
--- a/translations/client_nb_NO.ts
+++ b/translations/client_nb_NO.ts
@@ -64,6 +64,29 @@
</message>
</context>
<context>
+ <name>NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="20"/>
+ <source>Form</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="56"/>
+ <source>Lorem ipsum dolor sit amet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="63"/>
+ <source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="83"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountSettings</name>
<message>
<location filename="../src/gui/accountsettings.ui" line="14"/>
@@ -323,53 +346,53 @@
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="414"/>
- <location filename="../src/gui/activitywidget.cpp" line="456"/>
+ <location filename="../src/gui/activitywidget.cpp" line="496"/>
+ <location filename="../src/gui/activitywidget.cpp" line="548"/>
<source>Server Activity</source>
<translation>Server-aktivitet</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="419"/>
+ <location filename="../src/gui/activitywidget.cpp" line="502"/>
<source>Sync Protocol</source>
<translation>Synkroniseringsprotokoll</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="425"/>
+ <location filename="../src/gui/activitywidget.cpp" line="508"/>
<source>List of ignored or erroneous files</source>
<translation>Liste over filer som er ignorert eller har feil</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="429"/>
+ <location filename="../src/gui/activitywidget.cpp" line="512"/>
<source>Copy</source>
<translation>Kopier</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="430"/>
+ <location filename="../src/gui/activitywidget.cpp" line="513"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Kopier aktivitetslisten til utklippstavlen.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="435"/>
+ <location filename="../src/gui/activitywidget.cpp" line="518"/>
<source>Not Synced</source>
<translation>Ikke synkronisert</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="471"/>
+ <location filename="../src/gui/activitywidget.cpp" line="563"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation>Server-aktivitetslisten er kopiert til utklippstavlen.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="475"/>
+ <location filename="../src/gui/activitywidget.cpp" line="567"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation>Synkroniserings-aktivitetslisten er kopiert til utklippstavlen.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="478"/>
+ <location filename="../src/gui/activitywidget.cpp" line="570"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation>Listen med usynkroniserte elementer er kopiert til utklippstavlen.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="483"/>
+ <location filename="../src/gui/activitywidget.cpp" line="575"/>
<source>Copied to clipboard</source>
<translation>Kopiert til utklippstavlen</translation>
</message>
@@ -383,30 +406,56 @@
</message>
<message>
<location filename="../src/gui/activitywidget.ui" line="20"/>
- <location filename="../src/gui/activitywidget.ui" line="30"/>
+ <location filename="../src/gui/activitywidget.ui" line="50"/>
+ <location filename="../src/gui/activitywidget.ui" line="67"/>
<source>TextLabel</source>
<translation>Tekst-etikett</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="311"/>
+ <location filename="../src/gui/activitywidget.cpp" line="133"/>
<source>Server Activities</source>
<translation>Server-aktiviteter</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="284"/>
+ <location filename="../src/gui/activitywidget.cpp" line="88"/>
<source>Copy</source>
<translation>Kopier</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="285"/>
+ <location filename="../src/gui/activitywidget.cpp" line="89"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Kopier aktivitetslisten til utklippstavlen.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="318"/>
+ <location filename="../src/gui/activitywidget.cpp" line="137"/>
+ <source>Action Required: Notifications</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="142"/>
<source><br/>Account %1 does not have activities enabled.</source>
<translation><br/>Konto %1 har ikke aktiviteter aktivert.</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="334"/>
+ <source>You received %n new notification(s) from %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="342"/>
+ <source>You received %n new notification(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="344"/>
+ <source>You received new notifications from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="348"/>
+ <source>%1 Notifications - Action Required</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
@@ -1468,6 +1517,31 @@ Elementer hvor sletting er tillatt, vil bli slettet hvis de forhindrer fjerning
</message>
</context>
<context>
+ <name>OCC::NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="50"/>
+ <source>Created at %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="99"/>
+ <source>Closing in a few seconds...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="133"/>
+ <source>%1 request failed at %2</source>
+ <extracomment>The second parameter is a time, such as 'failed at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="139"/>
+ <source>'%1' selected at %2</source>
+ <extracomment>The second parameter is a time, such as 'selected at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::OCUpdater</name>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="103"/>
@@ -2199,22 +2273,22 @@ Det er ikke tilrådelig å bruke den.</translation>
<translation>Innstillinger</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="85"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="87"/>
<source>Activity</source>
<translation>Aktivitet</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="93"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>General</source>
<translation>Generelt</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="99"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="102"/>
<source>Network</source>
<translation>Nettverk</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="197"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="199"/>
<source>Account</source>
<translation>Konto</translation>
</message>
@@ -2759,18 +2833,18 @@ Det er ikke tilrådelig å bruke den.</translation>
<translation>Filen/mappen ignoreres fordi den er skjult.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="687"/>
+ <location filename="../src/libsync/syncengine.cpp" line="690"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Bare %1 er tilgjengelig, trenger minst %2 for å begynne</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1089"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1101"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Ikke tillatt fordi du ikke har lov til å legge til foreldremappe</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1096"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1108"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Ikke tillatt fordi du ikke har lov til å opprette filer i den mappen</translation>
</message>
@@ -2860,69 +2934,69 @@ Det er ikke tilrådelig å bruke den.</translation>
<translation>Filnavn-koding er ikke gyldig</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="632"/>
+ <location filename="../src/libsync/syncengine.cpp" line="635"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Ugyldige tegn, gi et annet navn til "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="721"/>
+ <location filename="../src/libsync/syncengine.cpp" line="724"/>
<source>Unable to initialize a sync journal.</source>
<translation>Kan ikke initialisere en synkroniseringsjournal.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="804"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Cannot open the sync journal</source>
<translation>Kan ikke åpne synkroniseringsjournalen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="858"/>
+ <location filename="../src/libsync/syncengine.cpp" line="861"/>
<source>File name contains at least one invalid character</source>
<translation>Filnavnet inneholder minst ett ulovlig tegn</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1057"/>
- <location filename="../src/libsync/syncengine.cpp" line="1064"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1067"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignorert på grunn av svartelisten "velg hva som skal synkroniseres"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1083"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Ikke tillatt fordi du ikke har lov til å lage undermapper i den mappen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1128"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Ikke tillatt å laste opp denne filenfordi den er skrivebeskyttet på serveren, gjenoppretter</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1133"/>
- <location filename="../src/libsync/syncengine.cpp" line="1153"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1145"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
<source>Not allowed to remove, restoring</source>
<translation>Ikke tillatt å fjerne, gjenoppretter</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1178"/>
<source>Local files and share folder removed.</source>
<translation>Lokale filer og delingsmappe fjernet.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1221"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1233"/>
<source>Move not allowed, item restored</source>
<translation>Flytting ikke tillatt, element gjenopprettet</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1242"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Flytting ikke tillatt fordi %1 er skrivebeskyttet</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the destination</source>
<translation>målet</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the source</source>
<translation>kilden</translation>
</message>
diff --git a/translations/client_nl.ts b/translations/client_nl.ts
index f032572..00d5a38 100644
--- a/translations/client_nl.ts
+++ b/translations/client_nl.ts
@@ -64,6 +64,29 @@
</message>
</context>
<context>
+ <name>NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="20"/>
+ <source>Form</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="56"/>
+ <source>Lorem ipsum dolor sit amet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="63"/>
+ <source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="83"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountSettings</name>
<message>
<location filename="../src/gui/accountsettings.ui" line="14"/>
@@ -323,53 +346,53 @@
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="414"/>
- <location filename="../src/gui/activitywidget.cpp" line="456"/>
+ <location filename="../src/gui/activitywidget.cpp" line="496"/>
+ <location filename="../src/gui/activitywidget.cpp" line="548"/>
<source>Server Activity</source>
<translation>Serveractiviteit</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="419"/>
+ <location filename="../src/gui/activitywidget.cpp" line="502"/>
<source>Sync Protocol</source>
<translation>Synchronisatiegeschiedenis</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="425"/>
+ <location filename="../src/gui/activitywidget.cpp" line="508"/>
<source>List of ignored or erroneous files</source>
<translation>Lijst van genegeerde of foutieve bestanden</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="429"/>
+ <location filename="../src/gui/activitywidget.cpp" line="512"/>
<source>Copy</source>
<translation>Kopiëren</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="430"/>
+ <location filename="../src/gui/activitywidget.cpp" line="513"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Kopieer de activiteitenlijst naar het klembord.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="435"/>
+ <location filename="../src/gui/activitywidget.cpp" line="518"/>
<source>Not Synced</source>
<translation>Niet gesynchroniseerd</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="471"/>
+ <location filename="../src/gui/activitywidget.cpp" line="563"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation>De server activiteitenlijst is gekopieerd naar het klembord.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="475"/>
+ <location filename="../src/gui/activitywidget.cpp" line="567"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation>De sync activiteitenlijst is gekopieerd naar het klembord.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="478"/>
+ <location filename="../src/gui/activitywidget.cpp" line="570"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation>De lijst met niet gesyncte objecten is gekopieerd naar het klembord.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="483"/>
+ <location filename="../src/gui/activitywidget.cpp" line="575"/>
<source>Copied to clipboard</source>
<translation>Gekopieerd naar het klembord</translation>
</message>
@@ -383,30 +406,56 @@
</message>
<message>
<location filename="../src/gui/activitywidget.ui" line="20"/>
- <location filename="../src/gui/activitywidget.ui" line="30"/>
+ <location filename="../src/gui/activitywidget.ui" line="50"/>
+ <location filename="../src/gui/activitywidget.ui" line="67"/>
<source>TextLabel</source>
<translation>Tekstlabel</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="311"/>
+ <location filename="../src/gui/activitywidget.cpp" line="133"/>
<source>Server Activities</source>
<translation>Serveractiviteiten</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="284"/>
+ <location filename="../src/gui/activitywidget.cpp" line="88"/>
<source>Copy</source>
<translation>Kopiëren</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="285"/>
+ <location filename="../src/gui/activitywidget.cpp" line="89"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Kopieer de activiteitenlijst naar het klembord.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="318"/>
+ <location filename="../src/gui/activitywidget.cpp" line="137"/>
+ <source>Action Required: Notifications</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="142"/>
<source><br/>Account %1 does not have activities enabled.</source>
<translation><br/>Account %1 heeft geen activiteiten ingeschakeld.</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="334"/>
+ <source>You received %n new notification(s) from %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="342"/>
+ <source>You received %n new notification(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="344"/>
+ <source>You received new notifications from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="348"/>
+ <source>%1 Notifications - Action Required</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
@@ -1469,6 +1518,31 @@ Onderdelen die gewist mogen worden worden verwijderd als ze voorkomen dat een ma
</message>
</context>
<context>
+ <name>OCC::NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="50"/>
+ <source>Created at %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="99"/>
+ <source>Closing in a few seconds...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="133"/>
+ <source>%1 request failed at %2</source>
+ <extracomment>The second parameter is a time, such as 'failed at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="139"/>
+ <source>'%1' selected at %2</source>
+ <extracomment>The second parameter is a time, such as 'selected at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::OCUpdater</name>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="103"/>
@@ -2200,22 +2274,22 @@ We adviseren deze site niet te gebruiken.</translation>
<translation>Instellingen</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="85"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="87"/>
<source>Activity</source>
<translation>Activiteit</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="93"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>General</source>
<translation>Algemeen</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="99"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="102"/>
<source>Network</source>
<translation>Netwerk</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="197"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="199"/>
<source>Account</source>
<translation>Account</translation>
</message>
@@ -2760,18 +2834,18 @@ We adviseren deze site niet te gebruiken.</translation>
<translation>Bestand/Map is genegeerd omdat het verborgen is. </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="687"/>
+ <location filename="../src/libsync/syncengine.cpp" line="690"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Slechts %1 beschikbaar, maar heeft minimaal %2 nodig om te starten</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1089"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1101"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Niet toegestaan omdat u geen rechten hebt om een bovenliggende map toe te voegen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1096"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1108"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Niet toegestaan omdat u geen rechten hebt om bestanden in die map toe te voegen</translation>
</message>
@@ -2861,69 +2935,69 @@ We adviseren deze site niet te gebruiken.</translation>
<translation>Bestandsnaamcodering is niet geldig</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="632"/>
+ <location filename="../src/libsync/syncengine.cpp" line="635"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Ongeldige tekens, hernoem "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="721"/>
+ <location filename="../src/libsync/syncengine.cpp" line="724"/>
<source>Unable to initialize a sync journal.</source>
<translation>Niet in staat om een synchronisatie transactielog te starten.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="804"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Cannot open the sync journal</source>
<translation>Kan het sync transactielog niet openen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="858"/>
+ <location filename="../src/libsync/syncengine.cpp" line="861"/>
<source>File name contains at least one invalid character</source>
<translation>De bestandsnaam bevat ten minste één ongeldig teken</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1057"/>
- <location filename="../src/libsync/syncengine.cpp" line="1064"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1067"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Genegeerd vanwege de "wat synchroniseren" zwarte lijst</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1083"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Niet toegestaan, omdat je geen permissies hebt om submappen aan die map toe te voegen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1128"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Niet toegestaan om dit bestand te uploaden, omdat het alleen-lezen is op de server, herstellen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1133"/>
- <location filename="../src/libsync/syncengine.cpp" line="1153"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1145"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
<source>Not allowed to remove, restoring</source>
<translation>Niet toegestaan om te verwijderen, herstellen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1178"/>
<source>Local files and share folder removed.</source>
<translation>Lokale bestanden en share-map verwijderd. </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1221"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1233"/>
<source>Move not allowed, item restored</source>
<translation>Verplaatsen niet toegestaan, object hersteld</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1242"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Verplaatsen niet toegestaan, omdat %1 alleen-lezen is</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the destination</source>
<translation>bestemming</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the source</source>
<translation>bron</translation>
</message>
diff --git a/translations/client_pl.ts b/translations/client_pl.ts
index ea5274f..6fcea5c 100644
--- a/translations/client_pl.ts
+++ b/translations/client_pl.ts
@@ -64,6 +64,29 @@
</message>
</context>
<context>
+ <name>NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="20"/>
+ <source>Form</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="56"/>
+ <source>Lorem ipsum dolor sit amet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="63"/>
+ <source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="83"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountSettings</name>
<message>
<location filename="../src/gui/accountsettings.ui" line="14"/>
@@ -175,7 +198,7 @@
<message>
<location filename="../src/gui/accountsettings.cpp" line="521"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
- <translation type="unfinished"/>
+ <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="523"/>
@@ -190,7 +213,7 @@
<message>
<location filename="../src/gui/accountsettings.cpp" line="527"/>
<source>Signed out from %1.</source>
- <translation type="unfinished"/>
+ <translation>Wylogowano z %1.</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="529"/>
@@ -205,7 +228,7 @@
<message>
<location filename="../src/gui/accountsettings.cpp" line="635"/>
<source>There are new folders that were not synchronized because they are too big: </source>
- <translation type="unfinished"/>
+ <translation>Istnieją nowe foldery, które nie zostały zsynchronizowane, gdyż są za duże.</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="675"/>
@@ -323,53 +346,53 @@
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="414"/>
- <location filename="../src/gui/activitywidget.cpp" line="456"/>
+ <location filename="../src/gui/activitywidget.cpp" line="496"/>
+ <location filename="../src/gui/activitywidget.cpp" line="548"/>
<source>Server Activity</source>
<translation>Aktywność serwera</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="419"/>
+ <location filename="../src/gui/activitywidget.cpp" line="502"/>
<source>Sync Protocol</source>
<translation>Protokół synchronizacji</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="425"/>
+ <location filename="../src/gui/activitywidget.cpp" line="508"/>
<source>List of ignored or erroneous files</source>
<translation>Lista pominiętych lub błędnych plików</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="429"/>
+ <location filename="../src/gui/activitywidget.cpp" line="512"/>
<source>Copy</source>
<translation>Kopiuj</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="430"/>
+ <location filename="../src/gui/activitywidget.cpp" line="513"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Kopiuj listę aktywności do schowka.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="435"/>
+ <location filename="../src/gui/activitywidget.cpp" line="518"/>
<source>Not Synced</source>
<translation>Niezsynchronizowany</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="471"/>
+ <location filename="../src/gui/activitywidget.cpp" line="563"/>
<source>The server activity list has been copied to the clipboard.</source>
- <translation type="unfinished"/>
+ <translation>Log aktywności serwera został skopiowany do schowka.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="475"/>
+ <location filename="../src/gui/activitywidget.cpp" line="567"/>
<source>The sync activity list has been copied to the clipboard.</source>
- <translation type="unfinished"/>
+ <translation>Przebieg synchronizacji został skopiowany do schowka.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="478"/>
+ <location filename="../src/gui/activitywidget.cpp" line="570"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
- <translation type="unfinished"/>
+ <translation>Lista niezsynchronizowanych plików została skopiowana do schowka.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="483"/>
+ <location filename="../src/gui/activitywidget.cpp" line="575"/>
<source>Copied to clipboard</source>
<translation>Skopiuj do schowka</translation>
</message>
@@ -383,28 +406,54 @@
</message>
<message>
<location filename="../src/gui/activitywidget.ui" line="20"/>
- <location filename="../src/gui/activitywidget.ui" line="30"/>
+ <location filename="../src/gui/activitywidget.ui" line="50"/>
+ <location filename="../src/gui/activitywidget.ui" line="67"/>
<source>TextLabel</source>
<translation>Etykieta</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="311"/>
+ <location filename="../src/gui/activitywidget.cpp" line="133"/>
<source>Server Activities</source>
<translation>Działania serwera</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="284"/>
+ <location filename="../src/gui/activitywidget.cpp" line="88"/>
<source>Copy</source>
<translation>Kopiuj</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="285"/>
+ <location filename="../src/gui/activitywidget.cpp" line="89"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Kopiuj listę aktywności do schowka.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="318"/>
+ <location filename="../src/gui/activitywidget.cpp" line="137"/>
+ <source>Action Required: Notifications</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="142"/>
<source><br/>Account %1 does not have activities enabled.</source>
+ <translation><br/>Użytkownik %1 nie ma włączonej historii aktywności.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="334"/>
+ <source>You received %n new notification(s) from %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="342"/>
+ <source>You received %n new notification(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="344"/>
+ <source>You received new notifications from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="348"/>
+ <source>%1 Notifications - Action Required</source>
<translation type="unfinished"/>
</message>
</context>
@@ -528,7 +577,7 @@
<message>
<location filename="../src/gui/folder.cpp" line="136"/>
<source>%1 should be a folder but is not.</source>
- <translation type="unfinished"/>
+ <translation>%1 powinien być katalogiem, ale nie jest.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="139"/>
@@ -621,7 +670,8 @@
<location filename="../src/gui/folder.cpp" line="934"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
- <translation type="unfinished"/>
+ <translation>Nowy folder większy od %1 MB został dodany
+Przejdź do ustawień i zaznacz go, jeśli chcesz go pobrać.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="951"/>
@@ -652,22 +702,24 @@ Czy jesteś pewien, że chcesz wykonać tę operację ? </translation>
<source>This sync would reset the files to an erlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
- <translation type="unfinished"/>
+ <translation>Bieżąca synchronizacja przywróci pliki do poprzedniego czasu w folderze %1.
+Być może została przywrócona kopia zapasowa serwera?
+Jeśli kontynuujesz synchronizację, pliki zostaną nadpisane przez swój pierwotny stan. Czy chcesz zatrzymać swoje ostatnie pliki i nadać im status konfliktu?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="981"/>
<source>Backup detected</source>
- <translation type="unfinished"/>
+ <translation>Wykryto kopię zapasową.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="983"/>
<source>Normal Synchronisation</source>
- <translation type="unfinished"/>
+ <translation>Normalna synchronizacja.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="984"/>
<source>Keep Local Files as Conflict</source>
- <translation type="unfinished"/>
+ <translation>Zatrzymaj pliki lokalne i ustaw status konfliktu.</translation>
</message>
</context>
<context>
@@ -700,7 +752,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<message>
<location filename="../src/gui/folderman.cpp" line="1104"/>
<source>Waiting to start syncing.</source>
- <translation type="unfinished"/>
+ <translation>Poczekaj na rozpoczęcie synchronizacji.</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1107"/>
@@ -745,12 +797,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<message>
<location filename="../src/gui/folderman.cpp" line="1141"/>
<source>No valid folder selected!</source>
- <translation type="unfinished"/>
+ <translation>Nie wybrano poprawnego folderu.</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1152"/>
<source>The selected path is not a folder!</source>
- <translation type="unfinished"/>
+ <translation>Wybrana ścieżka nie jest katalogiem!</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1156"/>
@@ -760,17 +812,17 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<message>
<location filename="../src/gui/folderman.cpp" line="1171"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
- <translation type="unfinished"/>
+ <translation>Wybrany folder lokalny %1 jest już użyty na potrzeby innej synchronizacji. Proszę wybrać inny folder lokalny.</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1176"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
- <translation type="unfinished"/>
+ <translation>Lokalny folder %1 już zawiera folder użyty na potrzeby synchronizacji. Proszę wybrać inny folder lokalny.</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1183"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
- <translation type="unfinished"/>
+ <translation>Lokalny folder %1 jest dowiązaniem symbolicznym. Cel dowiązania zawiera folder użyty na potrzeby innej synchronizacji. Proszę wybrać inny folder lokalny bądź dowiązanie.</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1190"/>
@@ -793,7 +845,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<message>
<location filename="../src/gui/folderstatusdelegate.cpp" line="241"/>
<source>Synchronizing with local folder</source>
- <translation type="unfinished"/>
+ <translation>Synchronizacja z folderem lokalnym.</translation>
</message>
<message>
<location filename="../src/gui/folderstatusdelegate.cpp" line="285"/>
@@ -806,12 +858,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="127"/>
<source>You need to be connected to add a folder</source>
- <translation type="unfinished"/>
+ <translation>Musisz być podłączony, by dodać folder.</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="137"/>
<source>Click this button to add a folder to synchronize.</source>
- <translation type="unfinished"/>
+ <translation>Kliknij ten przycisk, by dodać folder do synchronizacji.</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="148"/>
@@ -822,7 +874,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="167"/>
<source>Error while loading the list of folders from the server.</source>
- <translation type="unfinished"/>
+ <translation>Wystąpił błąd podczas pobierania listy folderów z serwera.</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="204"/>
@@ -837,7 +889,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
<source>Fetching folder list from server...</source>
- <translation type="unfinished"/>
+ <translation>Pobieranie listy folderów z serwera.</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="814"/>
@@ -860,7 +912,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<location filename="../src/gui/folderstatusmodel.cpp" line="877"/>
<source>Syncing %1</source>
<extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment>
- <translation type="unfinished"/>
+ <translation>Synchronizowanie %1</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="879"/>
@@ -906,7 +958,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<location filename="../src/gui/folderstatusmodel.cpp" line="920"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
- <translation type="unfinished"/>
+ <translation>Plik %3 z %4, pozostało czasu %5 (%1 z %2)</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="926"/>
@@ -939,7 +991,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<message>
<location filename="../src/gui/folderwizard.cpp" line="564"/>
<source>Add Sync Connection</source>
- <translation type="unfinished"/>
+ <translation>Dodaj połączenie synchronizacji</translation>
</message>
</context>
<context>
@@ -957,7 +1009,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<message>
<location filename="../src/gui/folderwizard.cpp" line="81"/>
<source>The folder alias is a descriptive name for this sync connection.</source>
- <translation type="unfinished"/>
+ <translation>Alias folderu jest opisuje nazwę tego połączenia.</translation>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="115"/>
@@ -1155,7 +1207,11 @@ Continuing the sync as normal will cause all your files to be overwritten by an
User: %2
Account: %3
</source>
- <translation type="unfinished"/>
+ <translation>Proszę podać %1 hasło:
+
+Użytkownik: %2
+Konto: %3
+</translation>
</message>
<message>
<location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
@@ -1461,6 +1517,31 @@ Pozycje, dla których usuwanie jest dozwolone zostaną usunięte, jeżeli uprawn
</message>
</context>
<context>
+ <name>OCC::NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="50"/>
+ <source>Created at %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="99"/>
+ <source>Closing in a few seconds...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="133"/>
+ <source>%1 request failed at %2</source>
+ <extracomment>The second parameter is a time, such as 'failed at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="139"/>
+ <source>'%1' selected at %2</source>
+ <extracomment>The second parameter is a time, such as 'selected at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::OCUpdater</name>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="103"/>
@@ -2188,22 +2269,22 @@ Niezalecane jest jego użycie.</translation>
<translation>Ustawienia</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="85"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="87"/>
<source>Activity</source>
<translation>Aktywność</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="93"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>General</source>
<translation>Ogólne</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="99"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="102"/>
<source>Network</source>
<translation>Sieć</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="197"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="199"/>
<source>Account</source>
<translation>Konto</translation>
</message>
@@ -2748,18 +2829,18 @@ Niezalecane jest jego użycie.</translation>
<translation>Plik / katalog zostanie zignorowany, ponieważ jest ukryty.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="687"/>
+ <location filename="../src/libsync/syncengine.cpp" line="690"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1089"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1101"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Niedozwolone, ponieważ nie masz uprawnień do dodawania katalogu nadrzędnego</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1096"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1108"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Niedozwolone, ponieważ nie masz uprawnień do dodawania plików w tym katalogu</translation>
</message>
@@ -2849,69 +2930,69 @@ Niezalecane jest jego użycie.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="632"/>
+ <location filename="../src/libsync/syncengine.cpp" line="635"/>
<source>Invalid characters, please rename "%1"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="721"/>
+ <location filename="../src/libsync/syncengine.cpp" line="724"/>
<source>Unable to initialize a sync journal.</source>
<translation>Nie można zainicjować synchronizacji dziennika.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="804"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Cannot open the sync journal</source>
<translation>Nie można otworzyć dziennika synchronizacji</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="858"/>
+ <location filename="../src/libsync/syncengine.cpp" line="861"/>
<source>File name contains at least one invalid character</source>
<translation>Nazwa pliku zawiera co najmniej jeden nieprawidłowy znak</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1057"/>
- <location filename="../src/libsync/syncengine.cpp" line="1064"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1067"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1083"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Niedozwolone, ponieważ nie masz uprawnień do dodawania podkatalogów w tym katalogu</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1128"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Wgrywanie niedozwolone, ponieważ plik jest tylko do odczytu na serwerze, przywracanie</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1133"/>
- <location filename="../src/libsync/syncengine.cpp" line="1153"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1145"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
<source>Not allowed to remove, restoring</source>
<translation>Brak uprawnień by usunąć, przywracanie</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1178"/>
<source>Local files and share folder removed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1221"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1233"/>
<source>Move not allowed, item restored</source>
<translation>Przenoszenie niedozwolone, obiekt przywrócony</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1242"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Przenoszenie niedozwolone, ponieważ %1 jest tylko do odczytu</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the destination</source>
<translation>docelowy</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the source</source>
<translation>źródło</translation>
</message>
diff --git a/translations/client_pt.ts b/translations/client_pt.ts
index 4abb70d..56659ef 100644
--- a/translations/client_pt.ts
+++ b/translations/client_pt.ts
@@ -64,6 +64,29 @@
</message>
</context>
<context>
+ <name>NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="20"/>
+ <source>Form</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="56"/>
+ <source>Lorem ipsum dolor sit amet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="63"/>
+ <source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="83"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountSettings</name>
<message>
<location filename="../src/gui/accountsettings.ui" line="14"/>
@@ -323,53 +346,53 @@
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="414"/>
- <location filename="../src/gui/activitywidget.cpp" line="456"/>
+ <location filename="../src/gui/activitywidget.cpp" line="496"/>
+ <location filename="../src/gui/activitywidget.cpp" line="548"/>
<source>Server Activity</source>
<translation>Actividade do Servidor</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="419"/>
+ <location filename="../src/gui/activitywidget.cpp" line="502"/>
<source>Sync Protocol</source>
<translation>Protocolo de sincronização</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="425"/>
+ <location filename="../src/gui/activitywidget.cpp" line="508"/>
<source>List of ignored or erroneous files</source>
<translation>Lista de ficheiros ignorados ou com erros</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="429"/>
+ <location filename="../src/gui/activitywidget.cpp" line="512"/>
<source>Copy</source>
<translation>Copiar</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="430"/>
+ <location filename="../src/gui/activitywidget.cpp" line="513"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Copiar lista de actividades para a área de transferência.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="435"/>
+ <location filename="../src/gui/activitywidget.cpp" line="518"/>
<source>Not Synced</source>
<translation>Não sincronizado</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="471"/>
+ <location filename="../src/gui/activitywidget.cpp" line="563"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation>A lista de atividades do servidor foi copiada para a área de transferência.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="475"/>
+ <location filename="../src/gui/activitywidget.cpp" line="567"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation>A lista de atividades de sincronização foi copiada para a área de transferência.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="478"/>
+ <location filename="../src/gui/activitywidget.cpp" line="570"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation>A lista de itens não sincronizados foi copiada para a área de transferência.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="483"/>
+ <location filename="../src/gui/activitywidget.cpp" line="575"/>
<source>Copied to clipboard</source>
<translation>Copiado para a área de transferência</translation>
</message>
@@ -383,30 +406,56 @@
</message>
<message>
<location filename="../src/gui/activitywidget.ui" line="20"/>
- <location filename="../src/gui/activitywidget.ui" line="30"/>
+ <location filename="../src/gui/activitywidget.ui" line="50"/>
+ <location filename="../src/gui/activitywidget.ui" line="67"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="311"/>
+ <location filename="../src/gui/activitywidget.cpp" line="133"/>
<source>Server Activities</source>
<translation>Actividades do Servidor</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="284"/>
+ <location filename="../src/gui/activitywidget.cpp" line="88"/>
<source>Copy</source>
<translation>Copiar</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="285"/>
+ <location filename="../src/gui/activitywidget.cpp" line="89"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Copiar lista de actividades para a área de transferência.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="318"/>
+ <location filename="../src/gui/activitywidget.cpp" line="137"/>
+ <source>Action Required: Notifications</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="142"/>
<source><br/>Account %1 does not have activities enabled.</source>
<translation><br/>Conta %1 não tem atividades ativada.</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="334"/>
+ <source>You received %n new notification(s) from %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="342"/>
+ <source>You received %n new notification(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="344"/>
+ <source>You received new notifications from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="348"/>
+ <source>%1 Notifications - Action Required</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
@@ -1468,6 +1517,31 @@ Os itens onde é permitido a eliminação serão eliminados se estes impedirem a
</message>
</context>
<context>
+ <name>OCC::NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="50"/>
+ <source>Created at %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="99"/>
+ <source>Closing in a few seconds...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="133"/>
+ <source>%1 request failed at %2</source>
+ <extracomment>The second parameter is a time, such as 'failed at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="139"/>
+ <source>'%1' selected at %2</source>
+ <extracomment>The second parameter is a time, such as 'selected at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::OCUpdater</name>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="103"/>
@@ -2198,22 +2272,22 @@ It is not advisable to use it.</source>
<translation>Definições</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="85"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="87"/>
<source>Activity</source>
<translation>Atividade</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="93"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>General</source>
<translation>Geral</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="99"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="102"/>
<source>Network</source>
<translation>Rede</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="197"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="199"/>
<source>Account</source>
<translation>Conta</translation>
</message>
@@ -2758,18 +2832,18 @@ It is not advisable to use it.</source>
<translation>O ficheiro/pasta foi ignorado porque está oculto.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="687"/>
+ <location filename="../src/libsync/syncengine.cpp" line="690"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Apenas %1 estão disponíveis, é preciso um mínimo de %2 para começar</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1089"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1101"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Não permitido, porque não tem permissão para adicionar a pasta fonte</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1096"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1108"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Não permitido, porque não tem permissão para adicionar os ficheiros nessa pasta</translation>
</message>
@@ -2859,69 +2933,69 @@ It is not advisable to use it.</source>
<translation>Codificação de nome de ficheiro não é válida</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="632"/>
+ <location filename="../src/libsync/syncengine.cpp" line="635"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Carateres inválidos, por favor, renomeie "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="721"/>
+ <location filename="../src/libsync/syncengine.cpp" line="724"/>
<source>Unable to initialize a sync journal.</source>
<translation>Impossível inicializar sincronização 'journal'.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="804"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Cannot open the sync journal</source>
<translation>Impossível abrir o jornal de sincronismo</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="858"/>
+ <location filename="../src/libsync/syncengine.cpp" line="861"/>
<source>File name contains at least one invalid character</source>
<translation>O nome de ficheiro contém pelo menos um caráter inválido</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1057"/>
- <location filename="../src/libsync/syncengine.cpp" line="1064"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1067"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignorado devido à blacklist de escolha para sincronização</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1083"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Não permitido, porque não tem permissão para adicionar as subpastas nessa pasta</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1128"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Não é permitido fazer o envio deste ficheiro porque é só de leitura no servidor, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1133"/>
- <location filename="../src/libsync/syncengine.cpp" line="1153"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1145"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
<source>Not allowed to remove, restoring</source>
<translation>Não autorizado para remoção, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1178"/>
<source>Local files and share folder removed.</source>
<translation>Ficheiros locais e pasta partilhada removidos.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1221"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1233"/>
<source>Move not allowed, item restored</source>
<translation>Mover não foi permitido, item restaurado</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1242"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Mover não foi autorizado porque %1 é só de leitura</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the destination</source>
<translation>o destino</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the source</source>
<translation>a origem</translation>
</message>
diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts
index a7d1bc0..aaccf7e 100644
--- a/translations/client_pt_BR.ts
+++ b/translations/client_pt_BR.ts
@@ -64,6 +64,29 @@
</message>
</context>
<context>
+ <name>NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="20"/>
+ <source>Form</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="56"/>
+ <source>Lorem ipsum dolor sit amet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="63"/>
+ <source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="83"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountSettings</name>
<message>
<location filename="../src/gui/accountsettings.ui" line="14"/>
@@ -323,53 +346,53 @@
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="414"/>
- <location filename="../src/gui/activitywidget.cpp" line="456"/>
+ <location filename="../src/gui/activitywidget.cpp" line="496"/>
+ <location filename="../src/gui/activitywidget.cpp" line="548"/>
<source>Server Activity</source>
<translation>Atividade do Servidor</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="419"/>
+ <location filename="../src/gui/activitywidget.cpp" line="502"/>
<source>Sync Protocol</source>
<translation>Protocolo de Sincronização</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="425"/>
+ <location filename="../src/gui/activitywidget.cpp" line="508"/>
<source>List of ignored or erroneous files</source>
<translation>Lista de arquivos ignorados ou errôneos</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="429"/>
+ <location filename="../src/gui/activitywidget.cpp" line="512"/>
<source>Copy</source>
<translation>Copiar</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="430"/>
+ <location filename="../src/gui/activitywidget.cpp" line="513"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Copiar a lista de atividades para a área de transferência.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="435"/>
+ <location filename="../src/gui/activitywidget.cpp" line="518"/>
<source>Not Synced</source>
<translation>Não Sincronizado</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="471"/>
+ <location filename="../src/gui/activitywidget.cpp" line="563"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation>A lista de atividades do servidor tem sido copiados para o clipboard.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="475"/>
+ <location filename="../src/gui/activitywidget.cpp" line="567"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation>A lista de atividades do servidor foi copiada para a área de transferência.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="478"/>
+ <location filename="../src/gui/activitywidget.cpp" line="570"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation>A lista de itens não sincronizados foi copiada para a área de transferência.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="483"/>
+ <location filename="../src/gui/activitywidget.cpp" line="575"/>
<source>Copied to clipboard</source>
<translation>Copiado para área de transferência</translation>
</message>
@@ -383,30 +406,56 @@
</message>
<message>
<location filename="../src/gui/activitywidget.ui" line="20"/>
- <location filename="../src/gui/activitywidget.ui" line="30"/>
+ <location filename="../src/gui/activitywidget.ui" line="50"/>
+ <location filename="../src/gui/activitywidget.ui" line="67"/>
<source>TextLabel</source>
<translation>RótuloTexto</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="311"/>
+ <location filename="../src/gui/activitywidget.cpp" line="133"/>
<source>Server Activities</source>
<translation>Atividades do Servidor</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="284"/>
+ <location filename="../src/gui/activitywidget.cpp" line="88"/>
<source>Copy</source>
<translation>Copiar</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="285"/>
+ <location filename="../src/gui/activitywidget.cpp" line="89"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Copiar a lista de atividades para a área de transferência.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="318"/>
+ <location filename="../src/gui/activitywidget.cpp" line="137"/>
+ <source>Action Required: Notifications</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="142"/>
<source><br/>Account %1 does not have activities enabled.</source>
<translation><br/>A conta %1 não tem atividades ativadas.</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="334"/>
+ <source>You received %n new notification(s) from %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="342"/>
+ <source>You received %n new notification(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="344"/>
+ <source>You received new notifications from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="348"/>
+ <source>%1 Notifications - Action Required</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
@@ -1469,6 +1518,31 @@ Itens onde a eliminação é permitida serão excluídos se eles evitarem que um
</message>
</context>
<context>
+ <name>OCC::NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="50"/>
+ <source>Created at %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="99"/>
+ <source>Closing in a few seconds...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="133"/>
+ <source>%1 request failed at %2</source>
+ <extracomment>The second parameter is a time, such as 'failed at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="139"/>
+ <source>'%1' selected at %2</source>
+ <extracomment>The second parameter is a time, such as 'selected at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::OCUpdater</name>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="103"/>
@@ -2198,22 +2272,22 @@ It is not advisable to use it.</source>
<translation>Configurações</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="85"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="87"/>
<source>Activity</source>
<translation>Atividade</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="93"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>General</source>
<translation>Geral</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="99"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="102"/>
<source>Network</source>
<translation>Rede</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="197"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="199"/>
<source>Account</source>
<translation>Conta</translation>
</message>
@@ -2758,18 +2832,18 @@ It is not advisable to use it.</source>
<translation>Arquivo/pasta ignorado porque porque está escondido.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="687"/>
+ <location filename="../src/libsync/syncengine.cpp" line="690"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Apenas %1 estão disponíveis, precisamos de pelo menos %2 para começar</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1089"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1101"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Não permitido porque você não tem permissão para adicionar pasta mãe</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1096"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1108"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Não permitido porque você não tem permissão para adicionar arquivos na pasta</translation>
</message>
@@ -2859,69 +2933,69 @@ It is not advisable to use it.</source>
<translation>A codificação do nome do arquivo não é válida</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="632"/>
+ <location filename="../src/libsync/syncengine.cpp" line="635"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Caracteres inválidos, por favor renomear "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="721"/>
+ <location filename="../src/libsync/syncengine.cpp" line="724"/>
<source>Unable to initialize a sync journal.</source>
<translation>Impossibilitado de iniciar a sincronização.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="804"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Cannot open the sync journal</source>
<translation>Não é possível abrir o arquivo de sincronização</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="858"/>
+ <location filename="../src/libsync/syncengine.cpp" line="861"/>
<source>File name contains at least one invalid character</source>
<translation>O nome do arquivo contem pelo menos um caractere inválido </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1057"/>
- <location filename="../src/libsync/syncengine.cpp" line="1064"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1067"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignorado por causa da lista negra "escolher o que sincronizar"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1083"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Não permitido porque você não tem permissão para adicionar subpastas para essa pasta</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1128"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Não é permitido fazer o upload deste arquivo porque ele é somente leitura no servidor, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1133"/>
- <location filename="../src/libsync/syncengine.cpp" line="1153"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1145"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
<source>Not allowed to remove, restoring</source>
<translation>Não é permitido remover, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1178"/>
<source>Local files and share folder removed.</source>
<translation>Arquivos locais e pasta compartilhada removida.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1221"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1233"/>
<source>Move not allowed, item restored</source>
<translation>Não é permitido mover, item restaurado</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1242"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Não é permitido mover porque %1 é somente para leitura</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the destination</source>
<translation>o destino</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the source</source>
<translation>a fonte</translation>
</message>
diff --git a/translations/client_ru.ts b/translations/client_ru.ts
index 851363c..4b58ae2 100644
--- a/translations/client_ru.ts
+++ b/translations/client_ru.ts
@@ -64,6 +64,29 @@
</message>
</context>
<context>
+ <name>NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="20"/>
+ <source>Form</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="56"/>
+ <source>Lorem ipsum dolor sit amet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="63"/>
+ <source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="83"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountSettings</name>
<message>
<location filename="../src/gui/accountsettings.ui" line="14"/>
@@ -323,53 +346,53 @@
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="414"/>
- <location filename="../src/gui/activitywidget.cpp" line="456"/>
+ <location filename="../src/gui/activitywidget.cpp" line="496"/>
+ <location filename="../src/gui/activitywidget.cpp" line="548"/>
<source>Server Activity</source>
<translation>Действия Сервера</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="419"/>
+ <location filename="../src/gui/activitywidget.cpp" line="502"/>
<source>Sync Protocol</source>
<translation>Протокол синхронизации</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="425"/>
+ <location filename="../src/gui/activitywidget.cpp" line="508"/>
<source>List of ignored or erroneous files</source>
<translation>Список игнорируемых или ошибочных файлов</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="429"/>
+ <location filename="../src/gui/activitywidget.cpp" line="512"/>
<source>Copy</source>
<translation>Копировать</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="430"/>
+ <location filename="../src/gui/activitywidget.cpp" line="513"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Скопировать журнал синхронизации в буфер обмена.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="435"/>
+ <location filename="../src/gui/activitywidget.cpp" line="518"/>
<source>Not Synced</source>
<translation>Не синхронизировано</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="471"/>
+ <location filename="../src/gui/activitywidget.cpp" line="563"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation>Список активности сервера скопирован в буфер обмена.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="475"/>
+ <location filename="../src/gui/activitywidget.cpp" line="567"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation>Список активности синхронизации скопирован в буфер обмена.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="478"/>
+ <location filename="../src/gui/activitywidget.cpp" line="570"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation>Список несинхронизированных элементов скопирован в буфер обмена.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="483"/>
+ <location filename="../src/gui/activitywidget.cpp" line="575"/>
<source>Copied to clipboard</source>
<translation>Скопировано в буфер обмена</translation>
</message>
@@ -383,30 +406,56 @@
</message>
<message>
<location filename="../src/gui/activitywidget.ui" line="20"/>
- <location filename="../src/gui/activitywidget.ui" line="30"/>
+ <location filename="../src/gui/activitywidget.ui" line="50"/>
+ <location filename="../src/gui/activitywidget.ui" line="67"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="311"/>
+ <location filename="../src/gui/activitywidget.cpp" line="133"/>
<source>Server Activities</source>
<translation>Действия Сервера</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="284"/>
+ <location filename="../src/gui/activitywidget.cpp" line="88"/>
<source>Copy</source>
<translation>Копировать</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="285"/>
+ <location filename="../src/gui/activitywidget.cpp" line="89"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Скопировать журнал синхронизации в буфер обмена.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="318"/>
+ <location filename="../src/gui/activitywidget.cpp" line="137"/>
+ <source>Action Required: Notifications</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="142"/>
<source><br/>Account %1 does not have activities enabled.</source>
<translation><br/>У учетной записи %1 не включены события.</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="334"/>
+ <source>You received %n new notification(s) from %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="342"/>
+ <source>You received %n new notification(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="344"/>
+ <source>You received new notifications from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="348"/>
+ <source>%1 Notifications - Action Required</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
@@ -1467,6 +1516,31 @@ Items where deletion is allowed will be deleted if they prevent a directory from
</message>
</context>
<context>
+ <name>OCC::NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="50"/>
+ <source>Created at %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="99"/>
+ <source>Closing in a few seconds...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="133"/>
+ <source>%1 request failed at %2</source>
+ <extracomment>The second parameter is a time, such as 'failed at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="139"/>
+ <source>'%1' selected at %2</source>
+ <extracomment>The second parameter is a time, such as 'selected at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::OCUpdater</name>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="103"/>
@@ -2202,22 +2276,22 @@ It is not advisable to use it.</source>
<translation>Настройки</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="85"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="87"/>
<source>Activity</source>
<translation>События</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="93"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>General</source>
<translation>Основные</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="99"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="102"/>
<source>Network</source>
<translation>Сеть</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="197"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="199"/>
<source>Account</source>
<translation>Уч.запись</translation>
</message>
@@ -2762,18 +2836,18 @@ It is not advisable to use it.</source>
<translation>Файл/папка проигнорированы, так как являются скрытыми.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="687"/>
+ <location filename="../src/libsync/syncengine.cpp" line="690"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Только %1 доступно, нужно как минимум %2 чтобы начать</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1089"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1101"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Не разрешается, так как у вас нет полномочий на добавление родительской папки</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1096"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1108"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Не разрешается, так как у вас нет полномочий на добавление файлов в эту папку</translation>
</message>
@@ -2863,69 +2937,69 @@ It is not advisable to use it.</source>
<translation>Кодировка имени файла не верна</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="632"/>
+ <location filename="../src/libsync/syncengine.cpp" line="635"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Недопустимые символы, пожалуйста, переименуйте "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="721"/>
+ <location filename="../src/libsync/syncengine.cpp" line="724"/>
<source>Unable to initialize a sync journal.</source>
<translation>Невозможно инициализировать журнал синхронизации.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="804"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Cannot open the sync journal</source>
<translation>Не удаётся открыть журнал синхронизации</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="858"/>
+ <location filename="../src/libsync/syncengine.cpp" line="861"/>
<source>File name contains at least one invalid character</source>
<translation>Имя файла содержит по крайней мере один некорректный символ</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1057"/>
- <location filename="../src/libsync/syncengine.cpp" line="1064"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1067"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Игнорируется из-за черного списка в "что синхронизировать"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1083"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Не разрешается, так как у вас нет полномочий на добавление подпапок в папку.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1128"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Не допускается загрузка этого файла, так как на сервере он помечен только для чтения, восстанавливаем</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1133"/>
- <location filename="../src/libsync/syncengine.cpp" line="1153"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1145"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
<source>Not allowed to remove, restoring</source>
<translation>Не допускается удаление, восстанавливаем</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1178"/>
<source>Local files and share folder removed.</source>
<translation>Локальные файлы и общий каталог удалены.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1221"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1233"/>
<source>Move not allowed, item restored</source>
<translation>Перемещение не допускается, элемент восстановлен</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1242"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Перемещение не допускается, поскольку %1 помечен только для чтения</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the destination</source>
<translation>назначение</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the source</source>
<translation>источник</translation>
</message>
diff --git a/translations/client_sk.ts b/translations/client_sk.ts
index 3655fee..c5d43c2 100644
--- a/translations/client_sk.ts
+++ b/translations/client_sk.ts
@@ -64,6 +64,29 @@
</message>
</context>
<context>
+ <name>NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="20"/>
+ <source>Form</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="56"/>
+ <source>Lorem ipsum dolor sit amet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="63"/>
+ <source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="83"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountSettings</name>
<message>
<location filename="../src/gui/accountsettings.ui" line="14"/>
@@ -323,53 +346,53 @@
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="414"/>
- <location filename="../src/gui/activitywidget.cpp" line="456"/>
+ <location filename="../src/gui/activitywidget.cpp" line="496"/>
+ <location filename="../src/gui/activitywidget.cpp" line="548"/>
<source>Server Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="419"/>
+ <location filename="../src/gui/activitywidget.cpp" line="502"/>
<source>Sync Protocol</source>
<translation>Záznam synchronizácie</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="425"/>
+ <location filename="../src/gui/activitywidget.cpp" line="508"/>
<source>List of ignored or erroneous files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="429"/>
+ <location filename="../src/gui/activitywidget.cpp" line="512"/>
<source>Copy</source>
<translation>Kopírovať</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="430"/>
+ <location filename="../src/gui/activitywidget.cpp" line="513"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Skopírovať zoznam aktivít do schránky.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="435"/>
+ <location filename="../src/gui/activitywidget.cpp" line="518"/>
<source>Not Synced</source>
<translation>Nezosynchronizované</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="471"/>
+ <location filename="../src/gui/activitywidget.cpp" line="563"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="475"/>
+ <location filename="../src/gui/activitywidget.cpp" line="567"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="478"/>
+ <location filename="../src/gui/activitywidget.cpp" line="570"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="483"/>
+ <location filename="../src/gui/activitywidget.cpp" line="575"/>
<source>Copied to clipboard</source>
<translation>Skopírované do schránky</translation>
</message>
@@ -383,30 +406,56 @@
</message>
<message>
<location filename="../src/gui/activitywidget.ui" line="20"/>
- <location filename="../src/gui/activitywidget.ui" line="30"/>
+ <location filename="../src/gui/activitywidget.ui" line="50"/>
+ <location filename="../src/gui/activitywidget.ui" line="67"/>
<source>TextLabel</source>
<translation>Štítok</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="311"/>
+ <location filename="../src/gui/activitywidget.cpp" line="133"/>
<source>Server Activities</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="284"/>
+ <location filename="../src/gui/activitywidget.cpp" line="88"/>
<source>Copy</source>
<translation>Kopírovať</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="285"/>
+ <location filename="../src/gui/activitywidget.cpp" line="89"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Skopírovať zoznam aktivít do schránky.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="318"/>
+ <location filename="../src/gui/activitywidget.cpp" line="137"/>
+ <source>Action Required: Notifications</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="142"/>
<source><br/>Account %1 does not have activities enabled.</source>
<translation type="unfinished"/>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="334"/>
+ <source>You received %n new notification(s) from %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="342"/>
+ <source>You received %n new notification(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="344"/>
+ <source>You received new notifications from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="348"/>
+ <source>%1 Notifications - Action Required</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
@@ -1460,6 +1509,31 @@ Items where deletion is allowed will be deleted if they prevent a directory from
</message>
</context>
<context>
+ <name>OCC::NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="50"/>
+ <source>Created at %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="99"/>
+ <source>Closing in a few seconds...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="133"/>
+ <source>%1 request failed at %2</source>
+ <extracomment>The second parameter is a time, such as 'failed at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="139"/>
+ <source>'%1' selected at %2</source>
+ <extracomment>The second parameter is a time, such as 'selected at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::OCUpdater</name>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="103"/>
@@ -2193,22 +2267,22 @@ Nie je vhodné ju používať.</translation>
<translation>Nastavenia</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="85"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="87"/>
<source>Activity</source>
<translation>Aktivita</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="93"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>General</source>
<translation>Všeobecné</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="99"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="102"/>
<source>Network</source>
<translation>Sieť</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="197"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="199"/>
<source>Account</source>
<translation>Účet</translation>
</message>
@@ -2753,18 +2827,18 @@ Nie je vhodné ju používať.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="687"/>
+ <location filename="../src/libsync/syncengine.cpp" line="690"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1089"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1101"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1096"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1108"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
@@ -2854,69 +2928,69 @@ Nie je vhodné ju používať.</translation>
<translation>Kódovanie znakov názvu súboru je neplatné</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="632"/>
+ <location filename="../src/libsync/syncengine.cpp" line="635"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Neplatné znaky, premenujte prosím "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="721"/>
+ <location filename="../src/libsync/syncengine.cpp" line="724"/>
<source>Unable to initialize a sync journal.</source>
<translation>Nemôžem inicializovať synchronizačný žurnál.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="804"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Cannot open the sync journal</source>
<translation>Nemožno otvoriť sync žurnál</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="858"/>
+ <location filename="../src/libsync/syncengine.cpp" line="861"/>
<source>File name contains at least one invalid character</source>
<translation>Názov súboru obsahuje nevhodný znak</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1057"/>
- <location filename="../src/libsync/syncengine.cpp" line="1064"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1067"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignorované podľa nastavenia "vybrať čo synchronizovať"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1083"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1128"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Nie je dovolené tento súbor nahrať, pretože je na serveri iba na čítanie. Obnovuje sa.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1133"/>
- <location filename="../src/libsync/syncengine.cpp" line="1153"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1145"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
<source>Not allowed to remove, restoring</source>
<translation>Nie je dovolené odstrániť. Obnovuje sa.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1178"/>
<source>Local files and share folder removed.</source>
<translation>Lokálne súbory a zdieľaný priečinok boli odstránené.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1221"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1233"/>
<source>Move not allowed, item restored</source>
<translation>Presunutie nie je dovolené. Položka obnovená.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1242"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Presunutie nie je dovolené, pretože %1 je na serveri iba na čítanie</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the destination</source>
<translation>cieľ</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the source</source>
<translation>zdroj</translation>
</message>
diff --git a/translations/client_sl.ts b/translations/client_sl.ts
index d63c40e..1017e28 100644
--- a/translations/client_sl.ts
+++ b/translations/client_sl.ts
@@ -64,6 +64,29 @@
</message>
</context>
<context>
+ <name>NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="20"/>
+ <source>Form</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="56"/>
+ <source>Lorem ipsum dolor sit amet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="63"/>
+ <source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="83"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountSettings</name>
<message>
<location filename="../src/gui/accountsettings.ui" line="14"/>
@@ -323,53 +346,53 @@
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="414"/>
- <location filename="../src/gui/activitywidget.cpp" line="456"/>
+ <location filename="../src/gui/activitywidget.cpp" line="496"/>
+ <location filename="../src/gui/activitywidget.cpp" line="548"/>
<source>Server Activity</source>
<translation>Dejavnost strežnika</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="419"/>
+ <location filename="../src/gui/activitywidget.cpp" line="502"/>
<source>Sync Protocol</source>
<translation>Protokol usklajevanja</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="425"/>
+ <location filename="../src/gui/activitywidget.cpp" line="508"/>
<source>List of ignored or erroneous files</source>
<translation>Seznam prezrtih datotek ali datotek z napako</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="429"/>
+ <location filename="../src/gui/activitywidget.cpp" line="512"/>
<source>Copy</source>
<translation>Kopiraj</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="430"/>
+ <location filename="../src/gui/activitywidget.cpp" line="513"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Kopiraj seznam opravil v odložišče.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="435"/>
+ <location filename="../src/gui/activitywidget.cpp" line="518"/>
<source>Not Synced</source>
<translation>Ni usklajeno</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="471"/>
+ <location filename="../src/gui/activitywidget.cpp" line="563"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation>Seznam opravil strežnika je kopiran v odložišče.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="475"/>
+ <location filename="../src/gui/activitywidget.cpp" line="567"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation>Seznam opravil usklajevanja je kopiran v odložišče.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="478"/>
+ <location filename="../src/gui/activitywidget.cpp" line="570"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation>Seznam neusklajenih predmetov je kopiran v odložišče.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="483"/>
+ <location filename="../src/gui/activitywidget.cpp" line="575"/>
<source>Copied to clipboard</source>
<translation>Kopirano v odložišče</translation>
</message>
@@ -383,30 +406,56 @@
</message>
<message>
<location filename="../src/gui/activitywidget.ui" line="20"/>
- <location filename="../src/gui/activitywidget.ui" line="30"/>
+ <location filename="../src/gui/activitywidget.ui" line="50"/>
+ <location filename="../src/gui/activitywidget.ui" line="67"/>
<source>TextLabel</source>
<translation>Besedilna oznaka</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="311"/>
+ <location filename="../src/gui/activitywidget.cpp" line="133"/>
<source>Server Activities</source>
<translation>Dejavnosti strežnika</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="284"/>
+ <location filename="../src/gui/activitywidget.cpp" line="88"/>
<source>Copy</source>
<translation>Kopiraj</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="285"/>
+ <location filename="../src/gui/activitywidget.cpp" line="89"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Kopiraj seznam opravil v odložišče.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="318"/>
+ <location filename="../src/gui/activitywidget.cpp" line="137"/>
+ <source>Action Required: Notifications</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="142"/>
<source><br/>Account %1 does not have activities enabled.</source>
<translation><br/>Za račun %1 možnosti opravil niso omogočene.</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="334"/>
+ <source>You received %n new notification(s) from %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="342"/>
+ <source>You received %n new notification(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="344"/>
+ <source>You received new notifications from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="348"/>
+ <source>%1 Notifications - Action Required</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
@@ -1465,6 +1514,31 @@ Predmeti na mestu, kjer je brisanje dovoljeno, bodo izbisani, v kolikor zaradi n
</message>
</context>
<context>
+ <name>OCC::NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="50"/>
+ <source>Created at %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="99"/>
+ <source>Closing in a few seconds...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="133"/>
+ <source>%1 request failed at %2</source>
+ <extracomment>The second parameter is a time, such as 'failed at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="139"/>
+ <source>'%1' selected at %2</source>
+ <extracomment>The second parameter is a time, such as 'selected at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::OCUpdater</name>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="103"/>
@@ -2194,22 +2268,22 @@ Uporaba ni priporočljiva.</translation>
<translation>Nastavitve</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="85"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="87"/>
<source>Activity</source>
<translation>Dejavnosti</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="93"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>General</source>
<translation>Splošno</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="99"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="102"/>
<source>Network</source>
<translation>Omrežje</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="197"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="199"/>
<source>Account</source>
<translation>Račun</translation>
</message>
@@ -2754,18 +2828,18 @@ Uporaba ni priporočljiva.</translation>
<translation>Datoteka/Mapa je prezrta, ker je skrita.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="687"/>
+ <location filename="../src/libsync/syncengine.cpp" line="690"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1089"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1101"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Dejanje ni dovoljeno, ker ni ustreznih dovoljenj za dodajanje starševske mape</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1096"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1108"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Dejanje ni dovoljeno, ker ni ustreznih dovoljenj za dodajanje datotek v to mapo</translation>
</message>
@@ -2855,69 +2929,69 @@ Uporaba ni priporočljiva.</translation>
<translation>Kodni zapis imena datoteke ni veljaven.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="632"/>
+ <location filename="../src/libsync/syncengine.cpp" line="635"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Uporabljen je neveljaven znak; preimenujte "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="721"/>
+ <location filename="../src/libsync/syncengine.cpp" line="724"/>
<source>Unable to initialize a sync journal.</source>
<translation>Dnevnika usklajevanja ni mogoče začeti.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="804"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Cannot open the sync journal</source>
<translation>Ni mogoče odpreti dnevnika usklajevanja</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="858"/>
+ <location filename="../src/libsync/syncengine.cpp" line="861"/>
<source>File name contains at least one invalid character</source>
<translation>Ime datoteke vsebuje vsaj en neveljaven znak.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1057"/>
- <location filename="../src/libsync/syncengine.cpp" line="1064"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1067"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Prezrto, ker je predmet označen na črni listi za usklajevanje</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1083"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Dejanje ni dovoljeno! Ni ustreznih dovoljenj za dodajanje podmap v to mapo.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1128"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Ni dovoljeno pošiljati te datoteke, ker ima določena dovoljenja le za branje. Datoteka bo obnovljena na izvorno različico.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1133"/>
- <location filename="../src/libsync/syncengine.cpp" line="1153"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1145"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
<source>Not allowed to remove, restoring</source>
<translation>Odstranitev ni dovoljena, datoteka bo obnovljena.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1178"/>
<source>Local files and share folder removed.</source>
<translation>Krajevne datoteke in mape v souporabi so odstranjene.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1221"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1233"/>
<source>Move not allowed, item restored</source>
<translation>Premikanje ni dovoljeno, datoteka bo obnovljena.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1242"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Premikanje ni dovoljeno, ker je nastavljeno določilo %1 le za branje.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the destination</source>
<translation>cilj</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the source</source>
<translation>vir</translation>
</message>
diff --git a/translations/client_sr.ts b/translations/client_sr.ts
index 225e2fd..34281fb 100644
--- a/translations/client_sr.ts
+++ b/translations/client_sr.ts
@@ -64,6 +64,29 @@
</message>
</context>
<context>
+ <name>NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="20"/>
+ <source>Form</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="56"/>
+ <source>Lorem ipsum dolor sit amet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="63"/>
+ <source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="83"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountSettings</name>
<message>
<location filename="../src/gui/accountsettings.ui" line="14"/>
@@ -323,53 +346,53 @@
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="414"/>
- <location filename="../src/gui/activitywidget.cpp" line="456"/>
+ <location filename="../src/gui/activitywidget.cpp" line="496"/>
+ <location filename="../src/gui/activitywidget.cpp" line="548"/>
<source>Server Activity</source>
<translation>Активност сервера</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="419"/>
+ <location filename="../src/gui/activitywidget.cpp" line="502"/>
<source>Sync Protocol</source>
<translation>Протокол синхронизације</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="425"/>
+ <location filename="../src/gui/activitywidget.cpp" line="508"/>
<source>List of ignored or erroneous files</source>
<translation>Списак занемарених или фајлова са грешком</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="429"/>
+ <location filename="../src/gui/activitywidget.cpp" line="512"/>
<source>Copy</source>
<translation>Копирај</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="430"/>
+ <location filename="../src/gui/activitywidget.cpp" line="513"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Копирај активност у клипборд.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="435"/>
+ <location filename="../src/gui/activitywidget.cpp" line="518"/>
<source>Not Synced</source>
<translation>Несинхронизовано</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="471"/>
+ <location filename="../src/gui/activitywidget.cpp" line="563"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="475"/>
+ <location filename="../src/gui/activitywidget.cpp" line="567"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="478"/>
+ <location filename="../src/gui/activitywidget.cpp" line="570"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="483"/>
+ <location filename="../src/gui/activitywidget.cpp" line="575"/>
<source>Copied to clipboard</source>
<translation>Копирано у клипборд</translation>
</message>
@@ -383,30 +406,56 @@
</message>
<message>
<location filename="../src/gui/activitywidget.ui" line="20"/>
- <location filename="../src/gui/activitywidget.ui" line="30"/>
+ <location filename="../src/gui/activitywidget.ui" line="50"/>
+ <location filename="../src/gui/activitywidget.ui" line="67"/>
<source>TextLabel</source>
<translation>Текст ознака</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="311"/>
+ <location filename="../src/gui/activitywidget.cpp" line="133"/>
<source>Server Activities</source>
<translation>Активности сервера</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="284"/>
+ <location filename="../src/gui/activitywidget.cpp" line="88"/>
<source>Copy</source>
<translation>Копирај</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="285"/>
+ <location filename="../src/gui/activitywidget.cpp" line="89"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Копирај активност у клипборд.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="318"/>
+ <location filename="../src/gui/activitywidget.cpp" line="137"/>
+ <source>Action Required: Notifications</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="142"/>
<source><br/>Account %1 does not have activities enabled.</source>
<translation><br/>Налог %1 нема укључене активности.</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="334"/>
+ <source>You received %n new notification(s) from %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="342"/>
+ <source>You received %n new notification(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="344"/>
+ <source>You received new notifications from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="348"/>
+ <source>%1 Notifications - Action Required</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
@@ -1461,6 +1510,31 @@ Items where deletion is allowed will be deleted if they prevent a directory from
</message>
</context>
<context>
+ <name>OCC::NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="50"/>
+ <source>Created at %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="99"/>
+ <source>Closing in a few seconds...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="133"/>
+ <source>%1 request failed at %2</source>
+ <extracomment>The second parameter is a time, such as 'failed at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="139"/>
+ <source>'%1' selected at %2</source>
+ <extracomment>The second parameter is a time, such as 'selected at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::OCUpdater</name>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="103"/>
@@ -2194,22 +2268,22 @@ It is not advisable to use it.</source>
<translation>Поставке</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="85"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="87"/>
<source>Activity</source>
<translation>Активност</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="93"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>General</source>
<translation>Опште</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="99"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="102"/>
<source>Network</source>
<translation>Мрежа</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="197"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="199"/>
<source>Account</source>
<translation>Налог</translation>
</message>
@@ -2754,18 +2828,18 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="687"/>
+ <location filename="../src/libsync/syncengine.cpp" line="690"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1089"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1101"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1096"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1108"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
@@ -2855,69 +2929,69 @@ It is not advisable to use it.</source>
<translation>Кодирање назива фајла није исправно</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="632"/>
+ <location filename="../src/libsync/syncengine.cpp" line="635"/>
<source>Invalid characters, please rename "%1"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="721"/>
+ <location filename="../src/libsync/syncengine.cpp" line="724"/>
<source>Unable to initialize a sync journal.</source>
<translation>Није могуће покренути у синхронизацију дневника.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="804"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Cannot open the sync journal</source>
<translation>Не могу да отворим дневник синхронизације</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="858"/>
+ <location filename="../src/libsync/syncengine.cpp" line="861"/>
<source>File name contains at least one invalid character</source>
<translation>Назив садржи бар један недозвољен карактер</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1057"/>
- <location filename="../src/libsync/syncengine.cpp" line="1064"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1067"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Игнорисано јер се не налази на листи за синхронизацију</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1083"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1128"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Није могуће отпремити овај фајл јер је на серверу само за читање. Враћам</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1133"/>
- <location filename="../src/libsync/syncengine.cpp" line="1153"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1145"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
<source>Not allowed to remove, restoring</source>
<translation>Није могуће уклањање. Враћам</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1178"/>
<source>Local files and share folder removed.</source>
<translation>Локални фајлови и дељена фасцикла су уклоњени.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1221"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1233"/>
<source>Move not allowed, item restored</source>
<translation>Премештање није дозвољено. Ставка је враћена</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1242"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Премештање није дозвољено јер %1 је само за читање</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the destination</source>
<translation>одредиште</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the source</source>
<translation>извор</translation>
</message>
diff --git a/translations/client_sv.ts b/translations/client_sv.ts
index 3992e19..b33264d 100644
--- a/translations/client_sv.ts
+++ b/translations/client_sv.ts
@@ -64,6 +64,29 @@
</message>
</context>
<context>
+ <name>NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="20"/>
+ <source>Form</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="56"/>
+ <source>Lorem ipsum dolor sit amet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="63"/>
+ <source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="83"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountSettings</name>
<message>
<location filename="../src/gui/accountsettings.ui" line="14"/>
@@ -323,53 +346,53 @@
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="414"/>
- <location filename="../src/gui/activitywidget.cpp" line="456"/>
+ <location filename="../src/gui/activitywidget.cpp" line="496"/>
+ <location filename="../src/gui/activitywidget.cpp" line="548"/>
<source>Server Activity</source>
<translation>Serveraktivitet</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="419"/>
+ <location filename="../src/gui/activitywidget.cpp" line="502"/>
<source>Sync Protocol</source>
<translation>Synkprotokoll</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="425"/>
+ <location filename="../src/gui/activitywidget.cpp" line="508"/>
<source>List of ignored or erroneous files</source>
<translation>Lista av ignorerade eller felaktiga filer</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="429"/>
+ <location filename="../src/gui/activitywidget.cpp" line="512"/>
<source>Copy</source>
<translation>Kopiera</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="430"/>
+ <location filename="../src/gui/activitywidget.cpp" line="513"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Kopiera aktivitetslistan till urklipp.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="435"/>
+ <location filename="../src/gui/activitywidget.cpp" line="518"/>
<source>Not Synced</source>
<translation>Inte synkroniserad</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="471"/>
+ <location filename="../src/gui/activitywidget.cpp" line="563"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation>Listan på serveraktivitet har kopierats till urklipp.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="475"/>
+ <location filename="../src/gui/activitywidget.cpp" line="567"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation>Listan på synkaktivitet har kopierats till urklipp.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="478"/>
+ <location filename="../src/gui/activitywidget.cpp" line="570"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation>Listan över osynkroniserade objekt har kopierats till urklipp.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="483"/>
+ <location filename="../src/gui/activitywidget.cpp" line="575"/>
<source>Copied to clipboard</source>
<translation>Kopierat till urklipp</translation>
</message>
@@ -383,30 +406,56 @@
</message>
<message>
<location filename="../src/gui/activitywidget.ui" line="20"/>
- <location filename="../src/gui/activitywidget.ui" line="30"/>
+ <location filename="../src/gui/activitywidget.ui" line="50"/>
+ <location filename="../src/gui/activitywidget.ui" line="67"/>
<source>TextLabel</source>
<translation>Textetikett</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="311"/>
+ <location filename="../src/gui/activitywidget.cpp" line="133"/>
<source>Server Activities</source>
<translation>Serveraktivitet</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="284"/>
+ <location filename="../src/gui/activitywidget.cpp" line="88"/>
<source>Copy</source>
<translation>Kopiera</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="285"/>
+ <location filename="../src/gui/activitywidget.cpp" line="89"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Kopiera aktivitetslistan till urklipp.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="318"/>
+ <location filename="../src/gui/activitywidget.cpp" line="137"/>
+ <source>Action Required: Notifications</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="142"/>
<source><br/>Account %1 does not have activities enabled.</source>
<translation><br/>Kontot %1 har inte aktiviteter aktiverade</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="334"/>
+ <source>You received %n new notification(s) from %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="342"/>
+ <source>You received %n new notification(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="344"/>
+ <source>You received new notifications from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="348"/>
+ <source>%1 Notifications - Action Required</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
@@ -1468,6 +1517,31 @@ Objekt som tillåter radering kommer tas bort om de förhindrar en mapp att tas
</message>
</context>
<context>
+ <name>OCC::NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="50"/>
+ <source>Created at %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="99"/>
+ <source>Closing in a few seconds...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="133"/>
+ <source>%1 request failed at %2</source>
+ <extracomment>The second parameter is a time, such as 'failed at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="139"/>
+ <source>'%1' selected at %2</source>
+ <extracomment>The second parameter is a time, such as 'selected at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::OCUpdater</name>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="103"/>
@@ -2199,22 +2273,22 @@ Det är inte lämpligt använda den.</translation>
<translation>Inställningar</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="85"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="87"/>
<source>Activity</source>
<translation>Aktivitet</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="93"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>General</source>
<translation>Allmänt</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="99"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="102"/>
<source>Network</source>
<translation>Nätverk</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="197"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="199"/>
<source>Account</source>
<translation>Konto</translation>
</message>
@@ -2759,18 +2833,18 @@ Det är inte lämpligt använda den.</translation>
<translation>Filen/Mappen är ignorerad för att den är dold.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="687"/>
+ <location filename="../src/libsync/syncengine.cpp" line="690"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Endast %1 tillgängligt, behöver minst %2 för att starta</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1089"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1101"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Otillåtet eftersom du inte har rättigheter att lägga till övermappar</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1096"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1108"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Otillåtet eftersom du inte har rättigheter att lägga till filer i den mappen.</translation>
</message>
@@ -2860,69 +2934,69 @@ Det är inte lämpligt använda den.</translation>
<translation>Filnamnskodning är inte giltig</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="632"/>
+ <location filename="../src/libsync/syncengine.cpp" line="635"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Otillåtna tecken, var vänlig byt namn på "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="721"/>
+ <location filename="../src/libsync/syncengine.cpp" line="724"/>
<source>Unable to initialize a sync journal.</source>
<translation>Kan inte initialisera en synk journal. </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="804"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Cannot open the sync journal</source>
<translation>Kunde inte öppna synk journalen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="858"/>
+ <location filename="../src/libsync/syncengine.cpp" line="861"/>
<source>File name contains at least one invalid character</source>
<translation>Filnamnet innehåller minst ett ogiltigt tecken</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1057"/>
- <location filename="../src/libsync/syncengine.cpp" line="1064"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1067"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignorerad eftersom den är svartlistad i "välj vad som ska synkas" </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1083"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Otillåtet eftersom du inte har rättigheter att lägga till undermappar i den mappen.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1128"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Inte behörig att ladda upp denna fil då den är skrivskyddad på servern, återställer </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1133"/>
- <location filename="../src/libsync/syncengine.cpp" line="1153"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1145"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
<source>Not allowed to remove, restoring</source>
<translation>Inte behörig att radera, återställer</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1178"/>
<source>Local files and share folder removed.</source>
<translation>Lokala filer och mappar som är delade är borttagna.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1221"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1233"/>
<source>Move not allowed, item restored</source>
<translation>Det gick inte att genomföra flytten, objektet återställs</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1242"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Det gick inte att genomföra flytten då %1 är skrivskyddad</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the destination</source>
<translation>destinationen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the source</source>
<translation>källan</translation>
</message>
diff --git a/translations/client_th.ts b/translations/client_th.ts
index fd0b279..4e95bc8 100644
--- a/translations/client_th.ts
+++ b/translations/client_th.ts
@@ -64,6 +64,29 @@
</message>
</context>
<context>
+ <name>NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="20"/>
+ <source>Form</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="56"/>
+ <source>Lorem ipsum dolor sit amet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="63"/>
+ <source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="83"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountSettings</name>
<message>
<location filename="../src/gui/accountsettings.ui" line="14"/>
@@ -323,53 +346,53 @@
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="414"/>
- <location filename="../src/gui/activitywidget.cpp" line="456"/>
+ <location filename="../src/gui/activitywidget.cpp" line="496"/>
+ <location filename="../src/gui/activitywidget.cpp" line="548"/>
<source>Server Activity</source>
<translation>กิจกรรมของเซิร์ฟเวอร์</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="419"/>
+ <location filename="../src/gui/activitywidget.cpp" line="502"/>
<source>Sync Protocol</source>
<translation>โปรโตคอลที่ใช้ในการผสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="425"/>
+ <location filename="../src/gui/activitywidget.cpp" line="508"/>
<source>List of ignored or erroneous files</source>
<translation>รายชื่อของไฟล์ที่ถูกเพิกเฉยหรือมีผิดพลาด</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="429"/>
+ <location filename="../src/gui/activitywidget.cpp" line="512"/>
<source>Copy</source>
<translation>คัดลอก</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="430"/>
+ <location filename="../src/gui/activitywidget.cpp" line="513"/>
<source>Copy the activity list to the clipboard.</source>
<translation>คัดลอกรายชื่อกิจกรรมไปยังคลิปบอร์ด</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="435"/>
+ <location filename="../src/gui/activitywidget.cpp" line="518"/>
<source>Not Synced</source>
<translation>ไม่ถูกประสานข้อมูลให้ตรงกัน</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="471"/>
+ <location filename="../src/gui/activitywidget.cpp" line="563"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation>รายการกิจกรรมเซิร์ฟเวอร์ได้ถูกคัดลอกไปยังคลิปบอร์ด</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="475"/>
+ <location filename="../src/gui/activitywidget.cpp" line="567"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation>รายการกิจกรรมการประสานข้อมูลได้ถูกคัดลอกไปยังคลิปบอร์ด</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="478"/>
+ <location filename="../src/gui/activitywidget.cpp" line="570"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation>รายชื่อที่ไม่ถูกประสานข้อมูลได้รับการคัดลอกไปยังคลิปบอร์ด</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="483"/>
+ <location filename="../src/gui/activitywidget.cpp" line="575"/>
<source>Copied to clipboard</source>
<translation>คัดลอกไปยังคลิปบอร์ด</translation>
</message>
@@ -383,30 +406,56 @@
</message>
<message>
<location filename="../src/gui/activitywidget.ui" line="20"/>
- <location filename="../src/gui/activitywidget.ui" line="30"/>
+ <location filename="../src/gui/activitywidget.ui" line="50"/>
+ <location filename="../src/gui/activitywidget.ui" line="67"/>
<source>TextLabel</source>
<translation>ป้ายข้อความ</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="311"/>
+ <location filename="../src/gui/activitywidget.cpp" line="133"/>
<source>Server Activities</source>
<translation>กิจกรรมของเซิร์ฟเวอร์</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="284"/>
+ <location filename="../src/gui/activitywidget.cpp" line="88"/>
<source>Copy</source>
<translation>คัดลอก</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="285"/>
+ <location filename="../src/gui/activitywidget.cpp" line="89"/>
<source>Copy the activity list to the clipboard.</source>
<translation>คัดลอกรายชื่อกิจกรรมไปยังคลิปบอร์ด</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="318"/>
+ <location filename="../src/gui/activitywidget.cpp" line="137"/>
+ <source>Action Required: Notifications</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="142"/>
<source><br/>Account %1 does not have activities enabled.</source>
<translation><br/>บัญชี %1 ไม่มีกิจกรรมที่เปิดใช้งาน</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="334"/>
+ <source>You received %n new notification(s) from %2.</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="342"/>
+ <source>You received %n new notification(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="344"/>
+ <source>You received new notifications from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="348"/>
+ <source>%1 Notifications - Action Required</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
@@ -1467,6 +1516,31 @@ Items where deletion is allowed will be deleted if they prevent a directory from
</message>
</context>
<context>
+ <name>OCC::NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="50"/>
+ <source>Created at %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="99"/>
+ <source>Closing in a few seconds...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="133"/>
+ <source>%1 request failed at %2</source>
+ <extracomment>The second parameter is a time, such as 'failed at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="139"/>
+ <source>'%1' selected at %2</source>
+ <extracomment>The second parameter is a time, such as 'selected at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::OCUpdater</name>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="103"/>
@@ -2193,22 +2267,22 @@ It is not advisable to use it.</source>
<translation>ตั้งค่า</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="85"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="87"/>
<source>Activity</source>
<translation>กิจกรรม</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="93"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>General</source>
<translation>ทั่วไป</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="99"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="102"/>
<source>Network</source>
<translation>เครือข่าย</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="197"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="199"/>
<source>Account</source>
<translation>บัญชี</translation>
</message>
@@ -2751,18 +2825,18 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="687"/>
+ <location filename="../src/libsync/syncengine.cpp" line="690"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>มีเพียง %1 ที่พร้อมใช้งาน คุณจำเป็นต้องมีไม่น้อยกว่า %2 เพื่อเริ่มใช้งาน</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1089"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1101"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>ไม่ได้รับอนุญาต เพราะคุณไม่มีสิทธิ์ที่จะเพิ่มโฟลเดอร์หลัก</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1096"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1108"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>ไม่ได้รับอนุญาต เพราะคุณไม่มีสิทธิ์ที่จะเพิ่มไฟล์ในโฟลเดอร์นั้น</translation>
</message>
@@ -2852,69 +2926,69 @@ It is not advisable to use it.</source>
<translation>การเข้ารหัสชื่อไฟล์ไม่ถูกต้อง</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="632"/>
+ <location filename="../src/libsync/syncengine.cpp" line="635"/>
<source>Invalid characters, please rename "%1"</source>
<translation>ตัวอักษรไม่ถูกต้อง โปรดเปลี่ยนชื่อ "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="721"/>
+ <location filename="../src/libsync/syncengine.cpp" line="724"/>
<source>Unable to initialize a sync journal.</source>
<translation>ไม่สามารถเตรียมการประสานข้อมูลเจอร์นัล</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="804"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Cannot open the sync journal</source>
<translation>ไม่สามารถเปิดการผสานข้อมูลเจอร์นัล</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="858"/>
+ <location filename="../src/libsync/syncengine.cpp" line="861"/>
<source>File name contains at least one invalid character</source>
<translation>มีชื่อแฟ้มอย่างน้อยหนึ่งตัวอักษรที่ไม่ถูกต้อง</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1057"/>
- <location filename="../src/libsync/syncengine.cpp" line="1064"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1067"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>ถูกละเว้นเพราะ "ข้อมูลที่เลือกประสาน" ติดบัญชีดำ</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1083"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>ไม่อนุญาติเพราะคุณไม่มีสิทธิ์ที่จะเพิ่มโฟลเดอร์ย่อยของโฟลเดอร์นั้น</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1128"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>ไม่อนุญาตให้อัพโหลดไฟล์นี้เพราะมันจะอ่านได้เพียงอย่างเดียวบนเซิร์ฟเวอร์ กำลังฟื้นฟู</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1133"/>
- <location filename="../src/libsync/syncengine.cpp" line="1153"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1145"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
<source>Not allowed to remove, restoring</source>
<translation>ไม่อนุญาตให้ลบเพราะกำลังฟื้นฟู</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1178"/>
<source>Local files and share folder removed.</source>
<translation>ไฟล์ต้นทางและโฟลเดอร์ที่แชร์ถูกลบออก</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1221"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1233"/>
<source>Move not allowed, item restored</source>
<translation>ไม่ได้รับอนุญาตให้ย้าย เพราะกำลังฟื้นฟูรายการ</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1242"/>
<source>Move not allowed because %1 is read-only</source>
<translation>ไม่อนุญาตให้ย้ายเพราะ %1 จะอ่านได้เพียงอย่างเดียว</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the destination</source>
<translation>ปลายทาง</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the source</source>
<translation>แหล่งที่มา</translation>
</message>
diff --git a/translations/client_tr.ts b/translations/client_tr.ts
index 6062b3a..8e61897 100644
--- a/translations/client_tr.ts
+++ b/translations/client_tr.ts
@@ -64,6 +64,29 @@
</message>
</context>
<context>
+ <name>NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="20"/>
+ <source>Form</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="56"/>
+ <source>Lorem ipsum dolor sit amet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="63"/>
+ <source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="83"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountSettings</name>
<message>
<location filename="../src/gui/accountsettings.ui" line="14"/>
@@ -323,53 +346,53 @@
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="414"/>
- <location filename="../src/gui/activitywidget.cpp" line="456"/>
+ <location filename="../src/gui/activitywidget.cpp" line="496"/>
+ <location filename="../src/gui/activitywidget.cpp" line="548"/>
<source>Server Activity</source>
<translation>Sunucu Etkinliği</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="419"/>
+ <location filename="../src/gui/activitywidget.cpp" line="502"/>
<source>Sync Protocol</source>
<translation>Eşitleme Protokolü</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="425"/>
+ <location filename="../src/gui/activitywidget.cpp" line="508"/>
<source>List of ignored or erroneous files</source>
<translation>Gözardı edilen veya hatalı dosyaların listesi</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="429"/>
+ <location filename="../src/gui/activitywidget.cpp" line="512"/>
<source>Copy</source>
<translation>Kopyala</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="430"/>
+ <location filename="../src/gui/activitywidget.cpp" line="513"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Etkinlik listesini panoya kopyala.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="435"/>
+ <location filename="../src/gui/activitywidget.cpp" line="518"/>
<source>Not Synced</source>
<translation>Eşitlenmedi</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="471"/>
+ <location filename="../src/gui/activitywidget.cpp" line="563"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation>Sunucu etkinlik listesi panoya kopyalandı.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="475"/>
+ <location filename="../src/gui/activitywidget.cpp" line="567"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation>Eşitleme etkinlik listesi panoya kopyalandı.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="478"/>
+ <location filename="../src/gui/activitywidget.cpp" line="570"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation>Eşitlenmemiş ögelerin listesi panoya kopyalandı.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="483"/>
+ <location filename="../src/gui/activitywidget.cpp" line="575"/>
<source>Copied to clipboard</source>
<translation>Panoya kopyalandı</translation>
</message>
@@ -383,30 +406,56 @@
</message>
<message>
<location filename="../src/gui/activitywidget.ui" line="20"/>
- <location filename="../src/gui/activitywidget.ui" line="30"/>
+ <location filename="../src/gui/activitywidget.ui" line="50"/>
+ <location filename="../src/gui/activitywidget.ui" line="67"/>
<source>TextLabel</source>
<translation>MetinEtiketi</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="311"/>
+ <location filename="../src/gui/activitywidget.cpp" line="133"/>
<source>Server Activities</source>
<translation>Sunucu Etkinlikleri</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="284"/>
+ <location filename="../src/gui/activitywidget.cpp" line="88"/>
<source>Copy</source>
<translation>Kopyala</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="285"/>
+ <location filename="../src/gui/activitywidget.cpp" line="89"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Etkinlik listesini panoya kopyala.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="318"/>
+ <location filename="../src/gui/activitywidget.cpp" line="137"/>
+ <source>Action Required: Notifications</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="142"/>
<source><br/>Account %1 does not have activities enabled.</source>
<translation><br/>%1 hesabının geçerli kılınmış etkinlikleri bulunmamakta.</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="334"/>
+ <source>You received %n new notification(s) from %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="342"/>
+ <source>You received %n new notification(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="344"/>
+ <source>You received new notifications from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="348"/>
+ <source>%1 Notifications - Action Required</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
@@ -1467,6 +1516,31 @@ Bir dizinin silinmesine engel oluyorsa silmeye izin verilen yerlerdeki ögeler s
</message>
</context>
<context>
+ <name>OCC::NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="50"/>
+ <source>Created at %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="99"/>
+ <source>Closing in a few seconds...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="133"/>
+ <source>%1 request failed at %2</source>
+ <extracomment>The second parameter is a time, such as 'failed at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="139"/>
+ <source>'%1' selected at %2</source>
+ <extracomment>The second parameter is a time, such as 'selected at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::OCUpdater</name>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="103"/>
@@ -2197,22 +2271,22 @@ Kullanmanız önerilmez.</translation>
<translation>Ayarlar</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="85"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="87"/>
<source>Activity</source>
<translation>Etkinlik</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="93"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>General</source>
<translation>Genel</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="99"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="102"/>
<source>Network</source>
<translation>Ağ</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="197"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="199"/>
<source>Account</source>
<translation>Hesap</translation>
</message>
@@ -2757,18 +2831,18 @@ Kullanmanız önerilmez.</translation>
<translation>Dosya/Klasör gizli olduğu için yoksayıldı.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="687"/>
+ <location filename="../src/libsync/syncengine.cpp" line="690"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Sadece %1 mevcut, Çalıştırmak için en az %2 gerekmektedir</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1089"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1101"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Üst dizin ekleme yetkiniz olmadığından izin verilmedi</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1096"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1108"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Bu klasöre dosya ekleme yetkiniz olmadığından izin verilmedi</translation>
</message>
@@ -2858,69 +2932,69 @@ Kullanmanız önerilmez.</translation>
<translation>Dosya adı kodlaması geçerli değil</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="632"/>
+ <location filename="../src/libsync/syncengine.cpp" line="635"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Geçersiz karakterler, lütfen "%1" yerine yeni bir isim girin</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="721"/>
+ <location filename="../src/libsync/syncengine.cpp" line="724"/>
<source>Unable to initialize a sync journal.</source>
<translation>Bir eşitleme günlüğü başlatılamadı.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="804"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Cannot open the sync journal</source>
<translation>Eşitleme günlüğü açılamıyor</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="858"/>
+ <location filename="../src/libsync/syncengine.cpp" line="861"/>
<source>File name contains at least one invalid character</source>
<translation>Dosya adı en az bir geçersiz karakter içeriyor</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1057"/>
- <location filename="../src/libsync/syncengine.cpp" line="1064"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1067"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>"Eşitlenecekleri seçin" kara listesinde olduğundan yoksayıldı.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1083"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Bu dizine alt dizin ekleme yetkiniz olmadığından izin verilmedi</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1128"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Sunucuda salt okunur olduğundan, bu dosya yüklenemedi, geri alınıyor</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1133"/>
- <location filename="../src/libsync/syncengine.cpp" line="1153"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1145"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
<source>Not allowed to remove, restoring</source>
<translation>Kaldırmaya izin verilmedi, geri alınıyor</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1178"/>
<source>Local files and share folder removed.</source>
<translation>Yerel dosyalar ve paylaşım klasörü kaldırıldı.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1221"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1233"/>
<source>Move not allowed, item restored</source>
<translation>Taşımaya izin verilmedi, öge geri alındı</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1242"/>
<source>Move not allowed because %1 is read-only</source>
<translation>%1 salt okunur olduğundan taşımaya izin verilmedi</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the destination</source>
<translation>hedef</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the source</source>
<translation>kaynak</translation>
</message>
diff --git a/translations/client_uk.ts b/translations/client_uk.ts
index e974935..e820bd9 100644
--- a/translations/client_uk.ts
+++ b/translations/client_uk.ts
@@ -64,6 +64,29 @@
</message>
</context>
<context>
+ <name>NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="20"/>
+ <source>Form</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="56"/>
+ <source>Lorem ipsum dolor sit amet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="63"/>
+ <source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="83"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountSettings</name>
<message>
<location filename="../src/gui/accountsettings.ui" line="14"/>
@@ -323,53 +346,53 @@
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="414"/>
- <location filename="../src/gui/activitywidget.cpp" line="456"/>
+ <location filename="../src/gui/activitywidget.cpp" line="496"/>
+ <location filename="../src/gui/activitywidget.cpp" line="548"/>
<source>Server Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="419"/>
+ <location filename="../src/gui/activitywidget.cpp" line="502"/>
<source>Sync Protocol</source>
<translation>Протокол Синхронізації</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="425"/>
+ <location filename="../src/gui/activitywidget.cpp" line="508"/>
<source>List of ignored or erroneous files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="429"/>
+ <location filename="../src/gui/activitywidget.cpp" line="512"/>
<source>Copy</source>
<translation>Копіювати</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="430"/>
+ <location filename="../src/gui/activitywidget.cpp" line="513"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Скопіювати протокол синхронізації до буферу обміну.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="435"/>
+ <location filename="../src/gui/activitywidget.cpp" line="518"/>
<source>Not Synced</source>
<translation>Не сінхронізовано</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="471"/>
+ <location filename="../src/gui/activitywidget.cpp" line="563"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="475"/>
+ <location filename="../src/gui/activitywidget.cpp" line="567"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="478"/>
+ <location filename="../src/gui/activitywidget.cpp" line="570"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="483"/>
+ <location filename="../src/gui/activitywidget.cpp" line="575"/>
<source>Copied to clipboard</source>
<translation>Скопійовано в буфер обміну</translation>
</message>
@@ -383,30 +406,56 @@
</message>
<message>
<location filename="../src/gui/activitywidget.ui" line="20"/>
- <location filename="../src/gui/activitywidget.ui" line="30"/>
+ <location filename="../src/gui/activitywidget.ui" line="50"/>
+ <location filename="../src/gui/activitywidget.ui" line="67"/>
<source>TextLabel</source>
<translation>Мітка</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="311"/>
+ <location filename="../src/gui/activitywidget.cpp" line="133"/>
<source>Server Activities</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="284"/>
+ <location filename="../src/gui/activitywidget.cpp" line="88"/>
<source>Copy</source>
<translation>Копіювати</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="285"/>
+ <location filename="../src/gui/activitywidget.cpp" line="89"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Скопіювати протокол синхронізації до буферу обміну.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="318"/>
+ <location filename="../src/gui/activitywidget.cpp" line="137"/>
+ <source>Action Required: Notifications</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="142"/>
<source><br/>Account %1 does not have activities enabled.</source>
<translation type="unfinished"/>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="334"/>
+ <source>You received %n new notification(s) from %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="342"/>
+ <source>You received %n new notification(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="344"/>
+ <source>You received new notifications from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="348"/>
+ <source>%1 Notifications - Action Required</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
@@ -1457,6 +1506,31 @@ Items where deletion is allowed will be deleted if they prevent a directory from
</message>
</context>
<context>
+ <name>OCC::NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="50"/>
+ <source>Created at %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="99"/>
+ <source>Closing in a few seconds...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="133"/>
+ <source>%1 request failed at %2</source>
+ <extracomment>The second parameter is a time, such as 'failed at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="139"/>
+ <source>'%1' selected at %2</source>
+ <extracomment>The second parameter is a time, such as 'selected at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::OCUpdater</name>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="103"/>
@@ -2189,22 +2263,22 @@ It is not advisable to use it.</source>
<translation>Налаштування</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="85"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="87"/>
<source>Activity</source>
<translation>Активність</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="93"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>General</source>
<translation>Загалом</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="99"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="102"/>
<source>Network</source>
<translation>Мережа</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="197"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="199"/>
<source>Account</source>
<translation>Обліковий запис</translation>
</message>
@@ -2749,18 +2823,18 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="687"/>
+ <location filename="../src/libsync/syncengine.cpp" line="690"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Доступно лише %1, для початку необхідно хоча б %2</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1089"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1101"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1096"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1108"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
@@ -2850,69 +2924,69 @@ It is not advisable to use it.</source>
<translation>Кодування файлу не припустиме</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="632"/>
+ <location filename="../src/libsync/syncengine.cpp" line="635"/>
<source>Invalid characters, please rename "%1"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="721"/>
+ <location filename="../src/libsync/syncengine.cpp" line="724"/>
<source>Unable to initialize a sync journal.</source>
<translation>Не вдалося ініціалізувати протокол синхронізації.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="804"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Cannot open the sync journal</source>
<translation>Не вдається відкрити протокол синхронізації</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="858"/>
+ <location filename="../src/libsync/syncengine.cpp" line="861"/>
<source>File name contains at least one invalid character</source>
<translation>Ім’я файлу містить принаймні один некоректний символ</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1057"/>
- <location filename="../src/libsync/syncengine.cpp" line="1064"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1067"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ігнорується через чорний список в "обрати що синхронізувати"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1083"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Заборонено через відсутність прав додавання підкаталогів в цю теку.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1128"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Не дозволено завантажувати цей файл, оскільки він має дозвіл лише на перегляд, відновлюємо</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1133"/>
- <location filename="../src/libsync/syncengine.cpp" line="1153"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1145"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
<source>Not allowed to remove, restoring</source>
<translation>Не дозволено видаляти, відновлюємо</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1178"/>
<source>Local files and share folder removed.</source>
<translation>Локальні файли та теки в загальному доступі було видалено.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1221"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1233"/>
<source>Move not allowed, item restored</source>
<translation>Переміщення не дозволено, елемент відновлено </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1242"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Переміщення не дозволено, оскільки %1 помічений тільки для перегляду</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the destination</source>
<translation>призначення</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the source</source>
<translation>джерело</translation>
</message>
diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts
index c890e9a..05f7c46 100644
--- a/translations/client_zh_CN.ts
+++ b/translations/client_zh_CN.ts
@@ -64,6 +64,29 @@
</message>
</context>
<context>
+ <name>NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="20"/>
+ <source>Form</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="56"/>
+ <source>Lorem ipsum dolor sit amet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="63"/>
+ <source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="83"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountSettings</name>
<message>
<location filename="../src/gui/accountsettings.ui" line="14"/>
@@ -323,53 +346,53 @@
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="414"/>
- <location filename="../src/gui/activitywidget.cpp" line="456"/>
+ <location filename="../src/gui/activitywidget.cpp" line="496"/>
+ <location filename="../src/gui/activitywidget.cpp" line="548"/>
<source>Server Activity</source>
<translation>服务器动态</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="419"/>
+ <location filename="../src/gui/activitywidget.cpp" line="502"/>
<source>Sync Protocol</source>
<translation>同步协议</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="425"/>
+ <location filename="../src/gui/activitywidget.cpp" line="508"/>
<source>List of ignored or erroneous files</source>
<translation>忽视或错误的文件列表</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="429"/>
+ <location filename="../src/gui/activitywidget.cpp" line="512"/>
<source>Copy</source>
<translation>复制</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="430"/>
+ <location filename="../src/gui/activitywidget.cpp" line="513"/>
<source>Copy the activity list to the clipboard.</source>
<translation>复制动态列表到剪贴板。</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="435"/>
+ <location filename="../src/gui/activitywidget.cpp" line="518"/>
<source>Not Synced</source>
<translation>未同步</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="471"/>
+ <location filename="../src/gui/activitywidget.cpp" line="563"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation>服务器动态已被复制到剪贴板。</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="475"/>
+ <location filename="../src/gui/activitywidget.cpp" line="567"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation>同步动态已被复制到剪贴板。</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="478"/>
+ <location filename="../src/gui/activitywidget.cpp" line="570"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation>未同步项已被复制到剪贴板。</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="483"/>
+ <location filename="../src/gui/activitywidget.cpp" line="575"/>
<source>Copied to clipboard</source>
<translation>复制到剪贴板</translation>
</message>
@@ -383,30 +406,56 @@
</message>
<message>
<location filename="../src/gui/activitywidget.ui" line="20"/>
- <location filename="../src/gui/activitywidget.ui" line="30"/>
+ <location filename="../src/gui/activitywidget.ui" line="50"/>
+ <location filename="../src/gui/activitywidget.ui" line="67"/>
<source>TextLabel</source>
<translation>文本标签</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="311"/>
+ <location filename="../src/gui/activitywidget.cpp" line="133"/>
<source>Server Activities</source>
<translation>服务器动态</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="284"/>
+ <location filename="../src/gui/activitywidget.cpp" line="88"/>
<source>Copy</source>
<translation>复制</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="285"/>
+ <location filename="../src/gui/activitywidget.cpp" line="89"/>
<source>Copy the activity list to the clipboard.</source>
<translation>复制动态列表到剪贴板。</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="318"/>
+ <location filename="../src/gui/activitywidget.cpp" line="137"/>
+ <source>Action Required: Notifications</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="142"/>
<source><br/>Account %1 does not have activities enabled.</source>
<translation><br/>帐户%1没有同步活动。</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="334"/>
+ <source>You received %n new notification(s) from %2.</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="342"/>
+ <source>You received %n new notification(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="344"/>
+ <source>You received new notifications from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="348"/>
+ <source>%1 Notifications - Action Required</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
@@ -1467,6 +1516,31 @@ Items where deletion is allowed will be deleted if they prevent a directory from
</message>
</context>
<context>
+ <name>OCC::NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="50"/>
+ <source>Created at %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="99"/>
+ <source>Closing in a few seconds...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="133"/>
+ <source>%1 request failed at %2</source>
+ <extracomment>The second parameter is a time, such as 'failed at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="139"/>
+ <source>'%1' selected at %2</source>
+ <extracomment>The second parameter is a time, such as 'selected at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::OCUpdater</name>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="103"/>
@@ -2194,22 +2268,22 @@ It is not advisable to use it.</source>
<translation>设置</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="85"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="87"/>
<source>Activity</source>
<translation>动态</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="93"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>General</source>
<translation>常规</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="99"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="102"/>
<source>Network</source>
<translation>网络</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="197"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="199"/>
<source>Account</source>
<translation>账户</translation>
</message>
@@ -2754,18 +2828,18 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="687"/>
+ <location filename="../src/libsync/syncengine.cpp" line="690"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>仅有 %1 有效，至少需要 %2 才能开始</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1089"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1101"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>你没有权限增加父目录</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1096"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1108"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>你没有权限增加文件</translation>
</message>
@@ -2855,69 +2929,69 @@ It is not advisable to use it.</source>
<translation>文件名编码无效</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="632"/>
+ <location filename="../src/libsync/syncengine.cpp" line="635"/>
<source>Invalid characters, please rename "%1"</source>
<translation>无效的字符，请更改为 “%1”</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="721"/>
+ <location filename="../src/libsync/syncengine.cpp" line="724"/>
<source>Unable to initialize a sync journal.</source>
<translation>无法初始化同步日志</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="804"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Cannot open the sync journal</source>
<translation>无法打开同步日志</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="858"/>
+ <location filename="../src/libsync/syncengine.cpp" line="861"/>
<source>File name contains at least one invalid character</source>
<translation>文件名中存在至少一个非法字符</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1057"/>
- <location filename="../src/libsync/syncengine.cpp" line="1064"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1067"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>已忽略（“选择同步内容”黑名单）</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1083"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>你没有权限增加子目录</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1128"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>无法上传文件，因为服务器端此文件为只读，正在回退</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1133"/>
- <location filename="../src/libsync/syncengine.cpp" line="1153"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1145"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
<source>Not allowed to remove, restoring</source>
<translation>无法删除，正在回退</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1178"/>
<source>Local files and share folder removed.</source>
<translation>本地文件和共享文件夹已被删除。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1221"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1233"/>
<source>Move not allowed, item restored</source>
<translation>无法移动，正在回退</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1242"/>
<source>Move not allowed because %1 is read-only</source>
<translation>无法移动，%1为是只读的</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the destination</source>
<translation>目标</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the source</source>
<translation>源</translation>
</message>
diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts
index d994a08..c35e9fe 100644
--- a/translations/client_zh_TW.ts
+++ b/translations/client_zh_TW.ts
@@ -64,6 +64,29 @@
</message>
</context>
<context>
+ <name>NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="20"/>
+ <source>Form</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="56"/>
+ <source>Lorem ipsum dolor sit amet</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="63"/>
+ <source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.ui" line="83"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::AccountSettings</name>
<message>
<location filename="../src/gui/accountsettings.ui" line="14"/>
@@ -323,53 +346,53 @@
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="414"/>
- <location filename="../src/gui/activitywidget.cpp" line="456"/>
+ <location filename="../src/gui/activitywidget.cpp" line="496"/>
+ <location filename="../src/gui/activitywidget.cpp" line="548"/>
<source>Server Activity</source>
<translation>伺服器活動</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="419"/>
+ <location filename="../src/gui/activitywidget.cpp" line="502"/>
<source>Sync Protocol</source>
<translation>同步協定</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="425"/>
+ <location filename="../src/gui/activitywidget.cpp" line="508"/>
<source>List of ignored or erroneous files</source>
<translation>被忽略或者錯誤的檔案列表</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="429"/>
+ <location filename="../src/gui/activitywidget.cpp" line="512"/>
<source>Copy</source>
<translation>複製</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="430"/>
+ <location filename="../src/gui/activitywidget.cpp" line="513"/>
<source>Copy the activity list to the clipboard.</source>
<translation>複製活動列表到剪貼簿。</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="435"/>
+ <location filename="../src/gui/activitywidget.cpp" line="518"/>
<source>Not Synced</source>
<translation>尚未同步</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="471"/>
+ <location filename="../src/gui/activitywidget.cpp" line="563"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation>伺服器活動列表已經被複製到剪貼簿。</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="475"/>
+ <location filename="../src/gui/activitywidget.cpp" line="567"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation>同步活動列表已經被複製到剪貼簿。</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="478"/>
+ <location filename="../src/gui/activitywidget.cpp" line="570"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation>未同步的清單已經被複製到剪貼簿。</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="483"/>
+ <location filename="../src/gui/activitywidget.cpp" line="575"/>
<source>Copied to clipboard</source>
<translation>複製至剪貼簿中</translation>
</message>
@@ -383,30 +406,56 @@
</message>
<message>
<location filename="../src/gui/activitywidget.ui" line="20"/>
- <location filename="../src/gui/activitywidget.ui" line="30"/>
+ <location filename="../src/gui/activitywidget.ui" line="50"/>
+ <location filename="../src/gui/activitywidget.ui" line="67"/>
<source>TextLabel</source>
<translation>文字標籤</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="311"/>
+ <location filename="../src/gui/activitywidget.cpp" line="133"/>
<source>Server Activities</source>
<translation>伺服器活動</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="284"/>
+ <location filename="../src/gui/activitywidget.cpp" line="88"/>
<source>Copy</source>
<translation>複製</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="285"/>
+ <location filename="../src/gui/activitywidget.cpp" line="89"/>
<source>Copy the activity list to the clipboard.</source>
<translation>複製活動列表到剪貼簿。</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="318"/>
+ <location filename="../src/gui/activitywidget.cpp" line="137"/>
+ <source>Action Required: Notifications</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="142"/>
<source><br/>Account %1 does not have activities enabled.</source>
<translation><br/> 帳號 %1 尚未啟用紀錄行為功能</translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="334"/>
+ <source>You received %n new notification(s) from %2.</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/activitywidget.cpp" line="342"/>
+ <source>You received %n new notification(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="344"/>
+ <source>You received new notifications from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/activitywidget.cpp" line="348"/>
+ <source>%1 Notifications - Action Required</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
@@ -1466,6 +1515,31 @@ Items where deletion is allowed will be deleted if they prevent a directory from
</message>
</context>
<context>
+ <name>OCC::NotificationWidget</name>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="50"/>
+ <source>Created at %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="99"/>
+ <source>Closing in a few seconds...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="133"/>
+ <source>%1 request failed at %2</source>
+ <extracomment>The second parameter is a time, such as 'failed at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/notificationwidget.cpp" line="139"/>
+ <source>'%1' selected at %2</source>
+ <extracomment>The second parameter is a time, such as 'selected at 09:58pm'</extracomment>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::OCUpdater</name>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="103"/>
@@ -2195,22 +2269,22 @@ It is not advisable to use it.</source>
<translation>設定</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="85"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="87"/>
<source>Activity</source>
<translation>活動</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="93"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>General</source>
<translation>一般</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="99"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="102"/>
<source>Network</source>
<translation>網路</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="197"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="199"/>
<source>Account</source>
<translation>帳號</translation>
</message>
@@ -2755,18 +2829,18 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="687"/>
+ <location filename="../src/libsync/syncengine.cpp" line="690"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>目前僅有 %1 可以使用，至少需要 %2 才能開始</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1089"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1101"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>拒絕此操作，您沒有新增母資料夾的權限。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1096"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1108"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>拒絕此操作，您沒有新增檔案在此資料夾的權限。</translation>
</message>
@@ -2856,69 +2930,69 @@ It is not advisable to use it.</source>
<translation>檔案名稱編碼是無效的</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="632"/>
+ <location filename="../src/libsync/syncengine.cpp" line="635"/>
<source>Invalid characters, please rename "%1"</source>
<translation>無效的字元，請您重新命名 "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="721"/>
+ <location filename="../src/libsync/syncengine.cpp" line="724"/>
<source>Unable to initialize a sync journal.</source>
<translation>同步處理日誌無法初始化</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="804"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Cannot open the sync journal</source>
<translation>同步處理日誌無法開啟</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="858"/>
+ <location filename="../src/libsync/syncengine.cpp" line="861"/>
<source>File name contains at least one invalid character</source>
<translation>檔案名稱含有不合法的字元</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1057"/>
- <location filename="../src/libsync/syncengine.cpp" line="1064"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1067"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>已忽略。根據 "選擇要同步的項目"的黑名單</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1083"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>拒絕此操作，您沒有在此新增子資料夾的權限。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1128"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>拒絕上傳此檔案，此檔案在伺服器是唯讀檔，復原中</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1133"/>
- <location filename="../src/libsync/syncengine.cpp" line="1153"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1145"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
<source>Not allowed to remove, restoring</source>
<translation>不允許刪除，復原中</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1178"/>
<source>Local files and share folder removed.</source>
<translation>本地端檔案和共享資料夾已被刪除。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1221"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1233"/>
<source>Move not allowed, item restored</source>
<translation>不允許移動，物件復原中</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1242"/>
<source>Move not allowed because %1 is read-only</source>
<translation>不允許移動，因為 %1 是唯讀的</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the destination</source>
<translation>目標</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1231"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>the source</source>
<translation>來源</translation>
</message>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list