locale: Update translation files after rewrite to indicator-ng.h System Indicator style.

author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> 2020-11-12 14:55:43 +0100
committer: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> 2020-11-12 14:55:43 +0100
commit: a146339c86c592b4f4aaba69386b7772fb130abf (patch)
tree: 94ec0de4970c22af0802e60b9faa5746493ff5b7
parent: 9833b92f27b2639cd3a82d1abe880969d79680b7 (diff)
download: ayatana-indicator-notifications-a146339c86c592b4f4aaba69386b7772fb130abf.tar.gz
ayatana-indicator-notifications-a146339c86c592b4f4aaba69386b7772fb130abf.tar.bz2
ayatana-indicator-notifications-a146339c86c592b4f4aaba69386b7772fb130abf.zip
131 files changed, 1962 insertions, 6735 deletions
diff --git a/po/aa.po b/po/aa.po
index 3f72df0..0558dc8 100644
--- a/po/aa.po
+++ b/po/aa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 14:59+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/af.po b/po/af.po
index 40fab39..33241da 100644
--- a/po/af.po
+++ b/po/af.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2020-05-10 08:12+0000\n"
 "Last-Translator: iNetRoos <inetroos@gmail.com>\n"
 "Language-Team: Afrikaans <https://hosted.weblate.org/projects/ayatana-"
@@ -19,9 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.1-dev\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr "Vermeldings uitvee op grond van toepassingsnaam"
 
@@ -34,9 +32,7 @@ msgstr ""
 "Alle kennisgewings vanaf toepassingname wat op die swartlys verskyn, word "
 "uitgevee."
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr "Middel-muiskliek vee kennisgewings uit"
 
@@ -70,59 +66,42 @@ msgstr ""
 "Die indikator sal kennisgewings vertoon, beperk tot die maksimum aantal hier "
 "aangedui."
 
-#: ../src/indicator-notifications.c:177
+#: ../src/service.c:221
+msgid "from"
+msgstr "van"
+
+#: ../src/service.c:270 ../src/service.c:299
 msgid "Notifications"
 msgstr "Kennisgewings"
 
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-#, fuzzy
-msgid "Settings…"
-msgstr "Skep die kieslys item: instellings."
-
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] "Vee <small>(%d Kennisgewing)</small> uit"
-msgstr[1] "Vee <small>(%d Kennisgewings)</small> uit"
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
-msgstr "Instellings vir Indikator Kennisgewings"
-
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
-msgstr "Versteek-indikator"
-
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
-msgid "Do not disturb"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
+#: ../src/service.c:338
+msgid "Do not disturb"
 msgstr ""
 
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr "Maksimum aantal sigbare kennisgewings"
+#, fuzzy
+#~ msgid "Settings…"
+#~ msgstr "Skep die kieslys item: instellings."
 
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr "Verwyder"
+#~ msgid "Clear <small>(%d Notification)</small>"
+#~ msgid_plural "Clear <small>(%d Notifications)</small>"
+#~ msgstr[0] "Vee <small>(%d Kennisgewing)</small> uit"
+#~ msgstr[1] "Vee <small>(%d Kennisgewings)</small> uit"
 
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr "Bywerk"
+#~ msgid "Indicator Notifications Settings"
+#~ msgstr "Instellings vir Indikator Kennisgewings"
 
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr "van"
+#~ msgid "Hide indicator"
+#~ msgstr "Versteek-indikator"
+
+#~ msgid "Maximum number of visible notifications"
+#~ msgstr "Maksimum aantal sigbare kennisgewings"
+
+#~ msgid "Remove"
+#~ msgstr "Verwyder"
+
+#~ msgid "Add"
+#~ msgstr "Bywerk"
diff --git a/po/am.po b/po/am.po
index ea4cd08..b7c7ced 100644
--- a/po/am.po
+++ b/po/am.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/an.po b/po/an.po
index 8b9fee3..f0fc57e 100644
--- a/po/an.po
+++ b/po/an.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/ar.po b/po/ar.po
index c3814d7..72b2fa9 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2020-03-15 05:36+0000\n"
 "Last-Translator: yagoub fadel <yagoub76@gmail.com>\n"
 "Language-Team: Arabic <https://hosted.weblate.org/projects/ayatana-"
@@ -20,9 +20,7 @@ msgstr ""
 "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
 "X-Generator: Weblate 4.0-dev\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr "تجاهل الإخطارات حسب اسم التطبيق"
 
@@ -35,9 +33,7 @@ msgstr ""
 "إذا كان اسم التطبيق في القائمة السوداء ، فسيتم تجاهل جميع الإشعارات التي "
 "تطابق اسم التطبيق."
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -69,63 +65,46 @@ msgid ""
 "indicated by this value."
 msgstr "سيعرض المؤشر فقط عدد الإشعارات المشار إليها بهذه القيمة فقط."
 
-#: ../src/indicator-notifications.c:177
+#: ../src/service.c:221
+msgid "from"
+msgstr ""
+
+#: ../src/service.c:270 ../src/service.c:299
 msgid "Notifications"
 msgstr "إشعارات"
 
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-#, fuzzy
-msgid "Settings…"
-msgstr "الإعدادات..."
-
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] "صفر"
-msgstr[1] "واحد"
-msgstr[2] "اثنان"
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
-msgstr "إعدادات إخطارات المؤشر"
-
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
-msgstr "إخفاء المؤشر"
+#: ../src/service.c:327
+msgid "Clear"
+msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
 
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
+#, fuzzy
+#~ msgid "Settings…"
+#~ msgstr "الإعدادات..."
 
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr "الحد الأقصى لعدد الإشعارات المرئية"
+#~ msgid "Clear <small>(%d Notification)</small>"
+#~ msgid_plural "Clear <small>(%d Notifications)</small>"
+#~ msgstr[0] "صفر"
+#~ msgstr[1] "واحد"
+#~ msgstr[2] "اثنان"
+#~ msgstr[3] ""
+#~ msgstr[4] ""
+#~ msgstr[5] ""
 
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr "إزالة"
+#~ msgid "Indicator Notifications Settings"
+#~ msgstr "إعدادات إخطارات المؤشر"
 
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr "اضافة"
+#~ msgid "Hide indicator"
+#~ msgstr "إخفاء المؤشر"
 
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
+#~ msgid "Maximum number of visible notifications"
+#~ msgstr "الحد الأقصى لعدد الإشعارات المرئية"
+
+#~ msgid "Remove"
+#~ msgstr "إزالة"
+
+#~ msgid "Add"
+#~ msgstr "اضافة"
diff --git a/po/as.po b/po/as.po
index 84b1141..da0ae38 100644
--- a/po/as.po
+++ b/po/as.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 14:59+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/ast.po b/po/ast.po
index dc7fe25..d2d2ed7 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/az.po b/po/az.po
index 284a1f4..71f0c55 100644
--- a/po/az.po
+++ b/po/az.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/be.po b/po/be.po
index b8ee56f..a65aaa9 100644
--- a/po/be.po
+++ b/po/be.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2020-09-24 20:41+0000\n"
 "Last-Translator: Viktar Vauchkevich <victorenator@gmail.com>\n"
-"Language-Team: Belarusian <https://hosted.weblate.org/projects/"
-"ayatana-indicators/notifications-applet/be/>\n"
+"Language-Team: Belarusian <https://hosted.weblate.org/projects/ayatana-"
+"indicators/notifications-applet/be/>\n"
 "Language: be\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,9 +20,7 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 4.3-dev\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr "Адкінуць апавяшчэнні па імені прыкладання"
 
@@ -34,9 +32,7 @@ msgstr ""
 "Калі назва прыкладання ў чорным спісе, усе апавяшчэнні, што адпавядаюць, "
 "будуць адкінутыя."
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr "Ачысціць апавяшчэнні сярэдняй кнопкай"
 
@@ -70,59 +66,45 @@ msgstr ""
 "Індыкатар будзе адлюстроўваць не больш за заданую гэтым значэннем колькасць "
 "апавяшчэнняў."
 
-#: ../src/indicator-notifications.c:177
+#: ../src/service.c:221
+msgid "from"
+msgstr "з"
+
+#: ../src/service.c:270 ../src/service.c:299
 msgid "Notifications"
 msgstr "Апавяшчэнні"
 
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
-msgstr "Налады…"
-
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] "Ачысць <small>(%d апавяшчэнне)</small>"
-msgstr[1] "Ачысць <small>(%d апавяшчэнні)</small>"
-msgstr[2] "Ачысць <small>(%d апавяшчэнняў)</small>"
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
-msgstr "Налады індыкатара апавяшчэнняў"
-
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
-msgstr "Схаваць індыкатар"
+#: ../src/service.c:327
+msgid "Clear"
+msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr "Не хваляваць"
 
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr "Аб'мянаць элементы «Сцерці» і «Налады»"
+#~ msgid "Settings…"
+#~ msgstr "Налады…"
 
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr "Максімальная колькасць бачных апавяшчэнняў"
+#~ msgid "Clear <small>(%d Notification)</small>"
+#~ msgid_plural "Clear <small>(%d Notifications)</small>"
+#~ msgstr[0] "Ачысць <small>(%d апавяшчэнне)</small>"
+#~ msgstr[1] "Ачысць <small>(%d апавяшчэнні)</small>"
+#~ msgstr[2] "Ачысць <small>(%d апавяшчэнняў)</small>"
 
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr "Выдаліць"
+#~ msgid "Indicator Notifications Settings"
+#~ msgstr "Налады індыкатара апавяшчэнняў"
 
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr "Дадаць"
+#~ msgid "Hide indicator"
+#~ msgstr "Схаваць індыкатар"
 
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr "з"
+#~ msgid "Swap \"Clear\" and \"Settings\" items"
+#~ msgstr "Аб'мянаць элементы «Сцерці» і «Налады»"
+
+#~ msgid "Maximum number of visible notifications"
+#~ msgstr "Максімальная колькасць бачных апавяшчэнняў"
+
+#~ msgid "Remove"
+#~ msgstr "Выдаліць"
+
+#~ msgid "Add"
+#~ msgstr "Дадаць"
diff --git a/po/bem.po b/po/bem.po
index ec23bab..959a394 100644
--- a/po/bem.po
+++ b/po/bem.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/bg.po b/po/bg.po
index b2e06bc..ca20349 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/bn.po b/po/bn.po
index b3a457e..9ba4d99 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2020-10-12 09:26+0000\n"
 "Last-Translator: Yota321 <golamsayan@gmail.com>\n"
-"Language-Team: Bengali <https://hosted.weblate.org/projects/"
-"ayatana-indicators/notifications-applet/bn/>\n"
+"Language-Team: Bengali <https://hosted.weblate.org/projects/ayatana-"
+"indicators/notifications-applet/bn/>\n"
 "Language: bn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,9 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 4.3-dev\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr "অ্যাপ্লিকেশন নাম দ্বারা বিজ্ঞপ্তি বাতিল করুন"
 
@@ -30,12 +28,10 @@ msgid ""
 "If an application name is in the filter list, all notifications matching the "
 "application name will be discarded."
 msgstr ""
-"যদি কোনও অ্যাপ্লিকেশন নাম ফিল্টার তালিকায় থাকে তবে অ্যাপ্লিকেশন নামের সাথে "
-"মেলে এমন সমস্ত বিজ্ঞপ্তি বাতিল করা হবে।"
+"যদি কোনও অ্যাপ্লিকেশন নাম ফিল্টার তালিকায় থাকে তবে অ্যাপ্লিকেশন নামের সাথে মেলে "
+"এমন সমস্ত বিজ্ঞপ্তি বাতিল করা হবে।"
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 #, fuzzy
 msgid "Clear notifications on middle click"
 msgstr "মিডল ক্লিক এ বিজ্ঞপ্তি সাফ করুন"
@@ -65,60 +61,41 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
+#: ../src/service.c:221
+msgid "from"
+msgstr ""
+
+#: ../src/service.c:270 ../src/service.c:299
 msgid "Notifications"
 msgstr "বিজ্ঞপ্তি"
 
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
-msgstr "সেটিংস…"
-
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
-msgstr "সূচক বিজ্ঞপ্তি সেটিংস"
-
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
-msgstr "লুকানো সূচক"
-
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:327
+msgid "Clear"
+msgstr ""
+
+#: ../src/service.c:338
 #, fuzzy
 msgid "Do not disturb"
 msgstr "বিরক্ত করবেন না"
 
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr "\"সাফ করুন\" এবং \"সেটিংস\" আইটেমগুলি অদলবদল করুন"
+#~ msgid "Settings…"
+#~ msgstr "সেটিংস…"
 
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr "সর্বাধিক সংখ্যক দৃশ্যমান বিজ্ঞপ্তি"
+#~ msgid "Indicator Notifications Settings"
+#~ msgstr "সূচক বিজ্ঞপ্তি সেটিংস"
 
-#: ../src/indicator-notifications-settings.c:352
-#, fuzzy
-msgid "Remove"
-msgstr "মুছে ফেলা"
+#~ msgid "Hide indicator"
+#~ msgstr "লুকানো সূচক"
 
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr "যোগ করা"
+#~ msgid "Swap \"Clear\" and \"Settings\" items"
+#~ msgstr "\"সাফ করুন\" এবং \"সেটিংস\" আইটেমগুলি অদলবদল করুন"
 
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
+#~ msgid "Maximum number of visible notifications"
+#~ msgstr "সর্বাধিক সংখ্যক দৃশ্যমান বিজ্ঞপ্তি"
+
+#, fuzzy
+#~ msgid "Remove"
+#~ msgstr "মুছে ফেলা"
+
+#~ msgid "Add"
+#~ msgstr "যোগ করা"
diff --git a/po/bo.po b/po/bo.po
index e3a0604..8650261 100644
--- a/po/bo.po
+++ b/po/bo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/br.po b/po/br.po
index ea89b37..56c525b 100644
--- a/po/br.po
+++ b/po/br.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/bs.po b/po/bs.po
index 0e346fe..c4e7bf6 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 1918d23..9fbf593 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2020-10-27 14:36+0000\n"
 "Last-Translator: Joan CiberSheep <cibersheep@gmail.com>\n"
-"Language-Team: Catalan <https://hosted.weblate.org/projects/"
-"ayatana-indicators/notifications-applet/ca/>\n"
+"Language-Team: Catalan <https://hosted.weblate.org/projects/ayatana-"
+"indicators/notifications-applet/ca/>\n"
 "Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,9 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.3.2-dev\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr "Descarta les notificacions per nom d'aplicació"
 
@@ -33,9 +31,7 @@ msgstr ""
 "Si el nom d'una aplicació és a la llista de filtres, es descartaran totes "
 "les notificacions amb el nom d'aquesta aplicació."
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr "Neteja les notificacions amb un clic central"
 
@@ -69,58 +65,44 @@ msgstr ""
 "L'indicador només mostrarà com a màxim el nombre de notificacions indicades "
 "per aquest valor."
 
-#: ../src/indicator-notifications.c:177
+#: ../src/service.c:221
+msgid "from"
+msgstr "de"
+
+#: ../src/service.c:270 ../src/service.c:299
 msgid "Notifications"
 msgstr "Notificacions"
 
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
-msgstr "Paràmetres…"
-
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] "Neteja <small>(%d notificació)</small>"
-msgstr[1] "Neteja <small>(%d notificacions)</small>"
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
-msgstr "Paràmetres de l'indicador de notificacions"
-
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
-msgstr "Amaga l'indicador"
+#: ../src/service.c:327
+msgid "Clear"
+msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr "No molestar"
 
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr "Intercanvieu els elements «Esborra» i «Paràmetres»"
+#~ msgid "Settings…"
+#~ msgstr "Paràmetres…"
 
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr "Nombre màxim de notificacions visibles"
+#~ msgid "Clear <small>(%d Notification)</small>"
+#~ msgid_plural "Clear <small>(%d Notifications)</small>"
+#~ msgstr[0] "Neteja <small>(%d notificació)</small>"
+#~ msgstr[1] "Neteja <small>(%d notificacions)</small>"
 
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr "Elimina"
+#~ msgid "Indicator Notifications Settings"
+#~ msgstr "Paràmetres de l'indicador de notificacions"
 
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr "Afegeix"
+#~ msgid "Hide indicator"
+#~ msgstr "Amaga l'indicador"
 
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr "de"
+#~ msgid "Swap \"Clear\" and \"Settings\" items"
+#~ msgstr "Intercanvieu els elements «Esborra» i «Paràmetres»"
+
+#~ msgid "Maximum number of visible notifications"
+#~ msgstr "Nombre màxim de notificacions visibles"
+
+#~ msgid "Remove"
+#~ msgstr "Elimina"
+
+#~ msgid "Add"
+#~ msgstr "Afegeix"
diff --git a/po/ca@valencia.po b/po/ca@valencia.po
index 4c661e0..92e7b3a 100644
--- a/po/ca@valencia.po
+++ b/po/ca@valencia.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/ce.po b/po/ce.po
index f7d5fcb..fa14b2a 100644
--- a/po/ce.po
+++ b/po/ce.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/ckb.po b/po/ckb.po
index fad5138..c527e8d 100644
--- a/po/ckb.po
+++ b/po/ckb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/co.po b/po/co.po
index 46ac95f..7b56759 100644
--- a/po/co.po
+++ b/po/co.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/crh.po b/po/crh.po
index 33d06d0..90bad0f 100644
--- a/po/crh.po
+++ b/po/crh.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/cs.po b/po/cs.po
index bdb7d89..26ff233 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2020-11-12 08:28+0000\n"
 "Last-Translator: Milan Korecky <milan.korecky@gmail.com>\n"
 "Language-Team: Czech <https://hosted.weblate.org/projects/ayatana-indicators/"
@@ -19,9 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Weblate 4.4-dev\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr "Zahodit oznámení podle názvu aplikace"
 
@@ -33,9 +31,7 @@ msgstr ""
 "Pokud je název aplikace na seznamu vyloučených, všechna oznámení s "
 "odpovídajícím názvem aplikace budou zahozena."
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr "Vyčistit oznámení při kliknutím prostředním tlačítkem myši"
 
@@ -69,59 +65,45 @@ msgstr ""
 "Indikátor zobrazí nejvýše takový počet oznámení, který je stanoven touto "
 "hodnotou."
 
-#: ../src/indicator-notifications.c:177
+#: ../src/service.c:221
+msgid "from"
+msgstr "z"
+
+#: ../src/service.c:270 ../src/service.c:299
 msgid "Notifications"
 msgstr "Oznámení"
 
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
-msgstr "Nastavení…"
-
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] "Vyčistit <small>(%d oznámení)</small>"
-msgstr[1] "Vyčistit <small>(%d oznámení)</small>"
-msgstr[2] "Vyčistit <small>(%d oznámení)</small>"
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
-msgstr "Nastavení oznámení indikátorů"
-
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
-msgstr "Skrýt indikátor"
+#: ../src/service.c:327
+msgid "Clear"
+msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr "Nerušit"
 
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr "Zaměnit položky „Vymazat“ a „Nastavení“"
+#~ msgid "Settings…"
+#~ msgstr "Nastavení…"
 
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr "Nejvyšší nastavený počet viditelných položek"
+#~ msgid "Clear <small>(%d Notification)</small>"
+#~ msgid_plural "Clear <small>(%d Notifications)</small>"
+#~ msgstr[0] "Vyčistit <small>(%d oznámení)</small>"
+#~ msgstr[1] "Vyčistit <small>(%d oznámení)</small>"
+#~ msgstr[2] "Vyčistit <small>(%d oznámení)</small>"
 
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr "Odstranit"
+#~ msgid "Indicator Notifications Settings"
+#~ msgstr "Nastavení oznámení indikátorů"
 
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr "Přidat"
+#~ msgid "Hide indicator"
+#~ msgstr "Skrýt indikátor"
 
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr "z"
+#~ msgid "Swap \"Clear\" and \"Settings\" items"
+#~ msgstr "Zaměnit položky „Vymazat“ a „Nastavení“"
+
+#~ msgid "Maximum number of visible notifications"
+#~ msgstr "Nejvyšší nastavený počet viditelných položek"
+
+#~ msgid "Remove"
+#~ msgstr "Odstranit"
+
+#~ msgid "Add"
+#~ msgstr "Přidat"
diff --git a/po/csb.po b/po/csb.po
index 9915f22..ae6eb19 100644
--- a/po/csb.po
+++ b/po/csb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 14:59+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,9 +18,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -30,9 +28,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -61,59 +57,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/cv.po b/po/cv.po
index f9f7f1f..2f1e54b 100644
--- a/po/cv.po
+++ b/po/cv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/cy.po b/po/cy.po
index 021901b..6d8ce1d 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/da.po b/po/da.po
index cbbde60..86ab319 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2020-07-04 23:41+0000\n"
 "Last-Translator: Tobias p <sorenautonom667@gmail.com>\n"
 "Language-Team: Danish <https://hosted.weblate.org/projects/ayatana-"
@@ -19,9 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.2-dev\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -31,9 +29,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -62,58 +58,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr "Notifikationer"
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
-msgstr ""
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
+msgstr "Notifikationer"
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/de.po b/po/de.po
index 2d6ad45..95a0804 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2020-08-23 11:36+0000\n"
 "Last-Translator: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n"
-"Language-Team: German <https://hosted.weblate.org/projects/"
-"ayatana-indicators/notifications-applet/de/>\n"
+"Language-Team: German <https://hosted.weblate.org/projects/ayatana-"
+"indicators/notifications-applet/de/>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,9 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.2.1-dev\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr "Verwerfe Benachrichtigungen anhand des Anwendungsnamen"
 
@@ -33,9 +31,7 @@ msgstr ""
 "Wenn ein Anwendungsname auf der Filterliste steht, dann werden alle "
 "Benachrichtigungen dieser Anwendung verworfen."
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr "Benachrichtigungen löschen durch Klick auf mittlere Maustaste"
 
@@ -70,58 +66,44 @@ msgstr ""
 "Der Indikator wird nur höchstens so viele Benachrichtigungen anzeigen, wie "
 "von diesem Wert festgelegt."
 
-#: ../src/indicator-notifications.c:177
+#: ../src/service.c:221
+msgid "from"
+msgstr "von"
+
+#: ../src/service.c:270 ../src/service.c:299
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
-msgstr "Einstellungen…"
-
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] "Liste leeren <small>(%d Benachrichtigung)</small>"
-msgstr[1] "Liste leeren <small>(%d Benachrichtigungen)</small>"
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
-msgstr "Benachrichtigungs-Indikator Einstellungen"
-
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
-msgstr "Indikator verstecken"
-
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:327
+msgid "Clear"
+msgstr ""
+
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr "Bitte nicht stören"
 
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr "Menüpunkte \"Löschen\" und \"Einstellungen\" tauschen"
+#~ msgid "Settings…"
+#~ msgstr "Einstellungen…"
 
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr "Maximale Anzahl sichtbarer Benachrichtigungen"
+#~ msgid "Clear <small>(%d Notification)</small>"
+#~ msgid_plural "Clear <small>(%d Notifications)</small>"
+#~ msgstr[0] "Liste leeren <small>(%d Benachrichtigung)</small>"
+#~ msgstr[1] "Liste leeren <small>(%d Benachrichtigungen)</small>"
 
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr "Entfernen"
+#~ msgid "Indicator Notifications Settings"
+#~ msgstr "Benachrichtigungs-Indikator Einstellungen"
 
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr "Hinzufügen"
+#~ msgid "Hide indicator"
+#~ msgstr "Indikator verstecken"
 
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr "von"
+#~ msgid "Swap \"Clear\" and \"Settings\" items"
+#~ msgstr "Menüpunkte \"Löschen\" und \"Einstellungen\" tauschen"
+
+#~ msgid "Maximum number of visible notifications"
+#~ msgstr "Maximale Anzahl sichtbarer Benachrichtigungen"
+
+#~ msgid "Remove"
+#~ msgstr "Entfernen"
+
+#~ msgid "Add"
+#~ msgstr "Hinzufügen"
diff --git a/po/dv.po b/po/dv.po
index b9aee63..290e10e 100644
--- a/po/dv.po
+++ b/po/dv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 14:59+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/el.po b/po/el.po
index 8a737e9..0faf5d2 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2020-04-17 16:11+0000\n"
 "Last-Translator: george k <norhorn@gmail.com>\n"
 "Language-Team: Greek <https://hosted.weblate.org/projects/ayatana-indicators/"
@@ -19,9 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.0.1-dev\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr "Απόρριψη ειδοποιήσεων κατά όνομα εφαρμογής"
 
@@ -34,9 +32,7 @@ msgstr ""
 "Εάν ένα όνομα εφαρμογής βρίσκεται στη μαύρη λίστα, όλες οι ειδοποιήσεις που "
 "αντιστοιχούν στο όνομα της εφαρμογής θα απορριφθούν."
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr "Απαλοιφή ειδοποιήσεων με το μεσαίο κλικ"
 
@@ -70,59 +66,42 @@ msgstr ""
 "Ο δείκτης θα εμφανίσει μόνο το πολύ τον αριθμό των ειδοποιήσεων που "
 "υποδεικνύονται από αυτήν την τιμή."
 
-#: ../src/indicator-notifications.c:177
+#: ../src/service.c:221
+msgid "from"
+msgstr "από"
+
+#: ../src/service.c:270 ../src/service.c:299
 msgid "Notifications"
 msgstr "Ειδοποιήσεις"
 
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-#, fuzzy
-msgid "Settings…"
-msgstr "Ρυθμίσεις..."
-
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] "Απαλοιφή <small>(%d ειδοποίησης)</small>"
-msgstr[1] "Απαλοιφή <small>(%d ειδοποιήσεων)</small>"
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
-msgstr "Ρυθμίσεις ειδοποιήσεων ενδείξεων"
-
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
-msgstr "Απόκρυψη ένδειξης"
-
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
-msgid "Do not disturb"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
+#: ../src/service.c:338
+msgid "Do not disturb"
 msgstr ""
 
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr "Μέγιστος αριθμός ορατών ειδοποιήσεων"
+#, fuzzy
+#~ msgid "Settings…"
+#~ msgstr "Ρυθμίσεις..."
 
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr "Αφαίρεση"
+#~ msgid "Clear <small>(%d Notification)</small>"
+#~ msgid_plural "Clear <small>(%d Notifications)</small>"
+#~ msgstr[0] "Απαλοιφή <small>(%d ειδοποίησης)</small>"
+#~ msgstr[1] "Απαλοιφή <small>(%d ειδοποιήσεων)</small>"
 
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr "Προσθήκη"
+#~ msgid "Indicator Notifications Settings"
+#~ msgstr "Ρυθμίσεις ειδοποιήσεων ενδείξεων"
 
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr "από"
+#~ msgid "Hide indicator"
+#~ msgstr "Απόκρυψη ένδειξης"
+
+#~ msgid "Maximum number of visible notifications"
+#~ msgstr "Μέγιστος αριθμός ορατών ειδοποιήσεων"
+
+#~ msgid "Remove"
+#~ msgstr "Αφαίρεση"
+
+#~ msgid "Add"
+#~ msgstr "Προσθήκη"
diff --git a/po/en_AU.po b/po/en_AU.po
index 20e197e..3241337 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2020-10-12 09:26+0000\n"
 "Last-Translator: Rob Pearson <rob.dunedin@gmail.com>\n"
 "Language-Team: English (Australia) <https://hosted.weblate.org/projects/"
@@ -19,9 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.3-dev\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr "Discard notifications by application name"
 
@@ -33,9 +31,7 @@ msgstr ""
 "If an application name is in the filter list, all notifications matching the "
 "application name will be discarded."
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr "Clear notifications on middle click"
 
@@ -69,58 +65,44 @@ msgstr ""
 "The indicator will only display at most the number of notifications "
 "indicated by this value."
 
-#: ../src/indicator-notifications.c:177
+#: ../src/service.c:221
+msgid "from"
+msgstr "from"
+
+#: ../src/service.c:270 ../src/service.c:299
 msgid "Notifications"
 msgstr "Notifications"
 
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
-msgstr "Settings…"
-
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] "Clear <small>(%d Notification)</small>"
-msgstr[1] "Clear <small>(%d Notifications)</small>"
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
-msgstr "Indicator Notifications Settings"
-
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
-msgstr "Hide indicator"
-
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:327
+msgid "Clear"
+msgstr ""
+
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr "Do not disturb"
 
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr "Swap \"Clear\" and \"Settings\" items"
+#~ msgid "Settings…"
+#~ msgstr "Settings…"
 
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr "Maximum number of visible notifications"
+#~ msgid "Clear <small>(%d Notification)</small>"
+#~ msgid_plural "Clear <small>(%d Notifications)</small>"
+#~ msgstr[0] "Clear <small>(%d Notification)</small>"
+#~ msgstr[1] "Clear <small>(%d Notifications)</small>"
 
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr "Remove"
+#~ msgid "Indicator Notifications Settings"
+#~ msgstr "Indicator Notifications Settings"
 
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr "Add"
+#~ msgid "Hide indicator"
+#~ msgstr "Hide indicator"
 
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr "from"
+#~ msgid "Swap \"Clear\" and \"Settings\" items"
+#~ msgstr "Swap \"Clear\" and \"Settings\" items"
+
+#~ msgid "Maximum number of visible notifications"
+#~ msgstr "Maximum number of visible notifications"
+
+#~ msgid "Remove"
+#~ msgstr "Remove"
+
+#~ msgid "Add"
+#~ msgstr "Add"
diff --git a/po/en_CA.po b/po/en_CA.po
index a6a239e..ea24c19 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2020-04-28 11:11+0000\n"
 "Last-Translator: Jeannette L <j.lavoie@net-c.ca>\n"
 "Language-Team: English (Canada) <https://hosted.weblate.org/projects/ayatana-"
@@ -19,9 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.0.2\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr "Discard notifications by application name"
 
@@ -34,9 +32,7 @@ msgstr ""
 "If an application name is in the blacklist, all notifications matching the "
 "application name will be discarded."
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr "Clear notifications on middle click"
 
@@ -70,59 +66,42 @@ msgstr ""
 "The indicator will only display at most the number of notifications "
 "indicated by this value."
 
-#: ../src/indicator-notifications.c:177
+#: ../src/service.c:221
+msgid "from"
+msgstr "from"
+
+#: ../src/service.c:270 ../src/service.c:299
 msgid "Notifications"
 msgstr "Notifications"
 
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-#, fuzzy
-msgid "Settings…"
-msgstr "Settings..."
-
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] "Clear <small>(%d Notification)</small>"
-msgstr[1] "Clear <small>(%d Notifications)</small>"
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
-msgstr "Indicator Notifications Settings"
-
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
-msgstr "Hide indicator"
-
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
-msgid "Do not disturb"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
+#: ../src/service.c:338
+msgid "Do not disturb"
 msgstr ""
 
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr "Maximum number of visible notifications"
+#, fuzzy
+#~ msgid "Settings…"
+#~ msgstr "Settings..."
 
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr "Remove"
+#~ msgid "Clear <small>(%d Notification)</small>"
+#~ msgid_plural "Clear <small>(%d Notifications)</small>"
+#~ msgstr[0] "Clear <small>(%d Notification)</small>"
+#~ msgstr[1] "Clear <small>(%d Notifications)</small>"
 
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr "Add"
+#~ msgid "Indicator Notifications Settings"
+#~ msgstr "Indicator Notifications Settings"
 
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr "from"
+#~ msgid "Hide indicator"
+#~ msgstr "Hide indicator"
+
+#~ msgid "Maximum number of visible notifications"
+#~ msgstr "Maximum number of visible notifications"
+
+#~ msgid "Remove"
+#~ msgstr "Remove"
+
+#~ msgid "Add"
+#~ msgstr "Add"
diff --git a/po/en_GB.po b/po/en_GB.po
index 3e83c90..024d2d6 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2020-10-12 09:26+0000\n"
 "Last-Translator: Rob Pearson <rob.dunedin@gmail.com>\n"
 "Language-Team: English (United Kingdom) <https://hosted.weblate.org/projects/"
@@ -19,9 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.3-dev\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr "Discard notifications by application name"
 
@@ -33,9 +31,7 @@ msgstr ""
 "If an application name is in the filter list, all notifications matching the "
 "application name will be discarded."
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr "Clear notifications on middle click"
 
@@ -69,58 +65,44 @@ msgstr ""
 "The indicator will only display at most the number of notifications "
 "indicated by this value."
 
-#: ../src/indicator-notifications.c:177
+#: ../src/service.c:221
+msgid "from"
+msgstr "from"
+
+#: ../src/service.c:270 ../src/service.c:299
 msgid "Notifications"
 msgstr "Notifications"
 
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
-msgstr "Settings…"
-
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] "Clear <small>(%d Notification)</small>"
-msgstr[1] "Clear <small>(%d Notifications)</small>"
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
-msgstr "Indicator Notifications Settings"
-
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
-msgstr "Hide indicator"
-
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:327
+msgid "Clear"
+msgstr ""
+
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr "Do not disturb"
 
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr "Swap \"Clear\" and \"Settings\" items"
+#~ msgid "Settings…"
+#~ msgstr "Settings…"
 
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr "Maximum number of visible notifications"
+#~ msgid "Clear <small>(%d Notification)</small>"
+#~ msgid_plural "Clear <small>(%d Notifications)</small>"
+#~ msgstr[0] "Clear <small>(%d Notification)</small>"
+#~ msgstr[1] "Clear <small>(%d Notifications)</small>"
 
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr "Remove"
+#~ msgid "Indicator Notifications Settings"
+#~ msgstr "Indicator Notifications Settings"
 
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr "Add"
+#~ msgid "Hide indicator"
+#~ msgstr "Hide indicator"
 
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr "from"
+#~ msgid "Swap \"Clear\" and \"Settings\" items"
+#~ msgstr "Swap \"Clear\" and \"Settings\" items"
+
+#~ msgid "Maximum number of visible notifications"
+#~ msgstr "Maximum number of visible notifications"
+
+#~ msgid "Remove"
+#~ msgstr "Remove"
+
+#~ msgid "Add"
+#~ msgstr "Add"
diff --git a/po/eo.po b/po/eo.po
index 3d6b31a..fdf9758 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/es.po b/po/es.po
index bc08077..9f05299 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2020-09-29 04:40+0000\n"
 "Last-Translator: Adolfo Jayme Barrientos <fitojb@ubuntu.com>\n"
-"Language-Team: Spanish <https://hosted.weblate.org/projects/"
-"ayatana-indicators/notifications-applet/es/>\n"
+"Language-Team: Spanish <https://hosted.weblate.org/projects/ayatana-"
+"indicators/notifications-applet/es/>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,9 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.3-dev\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr "Descartar notificaciones por nombre de aplicación"
 
@@ -33,9 +31,7 @@ msgstr ""
 "Si un nombre de aplicación está en la lista de filtrados, se descartarán "
 "todas las notificaciones que porten ese nombre."
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr "Vaciar las notificaciones con pulsación central"
 
@@ -69,58 +65,44 @@ msgstr ""
 "El indicador mostrará como máximo la cantidad de notificaciones "
 "correspondiente a este valor."
 
-#: ../src/indicator-notifications.c:177
+#: ../src/service.c:221
+msgid "from"
+msgstr "de"
+
+#: ../src/service.c:270 ../src/service.c:299
 msgid "Notifications"
 msgstr "Notificaciones"
 
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
-msgstr "Configuración…"
-
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] "Vaciar <small>(%d notificación)</small>"
-msgstr[1] "Vaciar <small>(%d notificaciones)</small>"
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
-msgstr "Configuración del menú de notificaciones"
-
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
-msgstr "Ocultar indicador"
-
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:327
+msgid "Clear"
+msgstr ""
+
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr "No molestar"
 
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr "Intercambiar elementos «Vaciar» y «Configuración»"
+#~ msgid "Settings…"
+#~ msgstr "Configuración…"
 
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr "Número máximo de elementos visibles"
+#~ msgid "Clear <small>(%d Notification)</small>"
+#~ msgid_plural "Clear <small>(%d Notifications)</small>"
+#~ msgstr[0] "Vaciar <small>(%d notificación)</small>"
+#~ msgstr[1] "Vaciar <small>(%d notificaciones)</small>"
 
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr "Quitar"
+#~ msgid "Indicator Notifications Settings"
+#~ msgstr "Configuración del menú de notificaciones"
 
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr "Añadir"
+#~ msgid "Hide indicator"
+#~ msgstr "Ocultar indicador"
 
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr "de"
+#~ msgid "Swap \"Clear\" and \"Settings\" items"
+#~ msgstr "Intercambiar elementos «Vaciar» y «Configuración»"
+
+#~ msgid "Maximum number of visible notifications"
+#~ msgstr "Número máximo de elementos visibles"
+
+#~ msgid "Remove"
+#~ msgstr "Quitar"
+
+#~ msgid "Add"
+#~ msgstr "Añadir"
diff --git a/po/et.po b/po/et.po
index 49bc3b4..fb2b860 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2020-04-04 06:04+0000\n"
 "Last-Translator: Kristjan Räts <kristjanrats@gmail.com>\n"
 "Language-Team: Estonian <https://hosted.weblate.org/projects/ayatana-"
@@ -19,9 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.0-dev\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr "Kustuta teated rakenduselt nimega"
 
@@ -34,9 +32,7 @@ msgstr ""
 "Kui rakendus on mustas nimekirjas, siis kustutatakse kõik teated, mis "
 "vastavad rakenduse nimele."
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr "Puhasta teated keskmise klahvi klõpsuga"
 
@@ -67,59 +63,42 @@ msgid ""
 "indicated by this value."
 msgstr "Indikaator ei kuva rohkem teateid, kui väärtusega määratud."
 
-#: ../src/indicator-notifications.c:177
+#: ../src/service.c:221
+msgid "from"
+msgstr "saatjalt"
+
+#: ../src/service.c:270 ../src/service.c:299
 msgid "Notifications"
 msgstr "Teated"
 
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-#, fuzzy
-msgid "Settings…"
-msgstr "Seaded..."
-
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] "Puhasta <small>(%d teade)</small>"
-msgstr[1] "Puhasta <small>(%d teadet)</small>"
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
-msgstr "Indikaatori teavituste seaded"
-
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
-msgstr "Peida indikaator"
+#: ../src/service.c:327
+msgid "Clear"
+msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
 
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
+#, fuzzy
+#~ msgid "Settings…"
+#~ msgstr "Seaded..."
 
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr "Kuvatavate teadete maksimaalne arv"
+#~ msgid "Clear <small>(%d Notification)</small>"
+#~ msgid_plural "Clear <small>(%d Notifications)</small>"
+#~ msgstr[0] "Puhasta <small>(%d teade)</small>"
+#~ msgstr[1] "Puhasta <small>(%d teadet)</small>"
 
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr "Eemalda"
+#~ msgid "Indicator Notifications Settings"
+#~ msgstr "Indikaatori teavituste seaded"
 
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr "Lisa"
+#~ msgid "Hide indicator"
+#~ msgstr "Peida indikaator"
 
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr "saatjalt"
+#~ msgid "Maximum number of visible notifications"
+#~ msgstr "Kuvatavate teadete maksimaalne arv"
+
+#~ msgid "Remove"
+#~ msgstr "Eemalda"
+
+#~ msgid "Add"
+#~ msgstr "Lisa"
diff --git a/po/eu.po b/po/eu.po
index 908eaeb..43adeb4 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/fa.po b/po/fa.po
index 99958b2..d29f95a 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2020-07-20 21:41+0000\n"
 "Last-Translator: Tetra Homer <tetrahomer@gmail.com>\n"
 "Language-Team: Persian <https://hosted.weblate.org/projects/ayatana-"
@@ -19,9 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 4.2-dev\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr "اعلان ها را بر اساس نام برنامه کنار بگذارید"
 
@@ -34,9 +32,7 @@ msgstr ""
 "اگر نام یک برنامه در لیست سیاه قرار داشته باشد، تمام اعلان های مطابق با نام "
 "برنامه حذف می شوند."
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr "پاک کردن اعلان‌ها با دکمه وسطی موشواره"
 
@@ -70,59 +66,42 @@ msgstr ""
 "این نشانگر فقط حداکثر تعداد اعلان های نشان داده شده توسط این مقدار را نشان "
 "می دهد."
 
-#: ../src/indicator-notifications.c:177
+#: ../src/service.c:221
+msgid "from"
+msgstr "از"
+
+#: ../src/service.c:270 ../src/service.c:299
 msgid "Notifications"
 msgstr "اعلانات"
 
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-#, fuzzy
-msgid "Settings…"
-msgstr "تنظیمات…"
-
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] "پاک‌کردن <small>(%d اعلان )</small>"
-msgstr[1] "پاک‌کردن <small>(%d اعلان‌ها )</small>"
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
-msgstr "تنظیمات اعلانات نشانگر"
-
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
-msgstr "مخفی کردن نشانگر"
+#: ../src/service.c:327
+msgid "Clear"
+msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
 
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
+#, fuzzy
+#~ msgid "Settings…"
+#~ msgstr "تنظیمات…"
 
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr "حداکثر تعداد اعلانات قابل مشاهده"
+#~ msgid "Clear <small>(%d Notification)</small>"
+#~ msgid_plural "Clear <small>(%d Notifications)</small>"
+#~ msgstr[0] "پاک‌کردن <small>(%d اعلان )</small>"
+#~ msgstr[1] "پاک‌کردن <small>(%d اعلان‌ها )</small>"
 
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr "حذف"
+#~ msgid "Indicator Notifications Settings"
+#~ msgstr "تنظیمات اعلانات نشانگر"
 
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr "افزودن"
+#~ msgid "Hide indicator"
+#~ msgstr "مخفی کردن نشانگر"
 
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr "از"
+#~ msgid "Maximum number of visible notifications"
+#~ msgstr "حداکثر تعداد اعلانات قابل مشاهده"
+
+#~ msgid "Remove"
+#~ msgstr "حذف"
+
+#~ msgid "Add"
+#~ msgstr "افزودن"
diff --git a/po/fi.po b/po/fi.po
index 8e57718..e04613d 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/fil.po b/po/fil.po
index a418c7f..f999b0d 100644
--- a/po/fil.po
+++ b/po/fil.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/fo.po b/po/fo.po
index 497124c..b193436 100644
--- a/po/fo.po
+++ b/po/fo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/fr.po b/po/fr.po
index d09dd27..81037d3 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2020-04-16 00:11+0000\n"
 "Last-Translator: Jeannette L <j.lavoie@net-c.ca>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/ayatana-"
@@ -19,9 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 4.0-dev\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr "Trier les notifications par le nom de l'application"
 
@@ -34,9 +32,7 @@ msgstr ""
 "Si le nom d'une application est sur la liste noire, toutes les notifications "
 "correspondants au nom de l'application seront ignorées."
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr "Effacer les notifications par un clic du milieu"
 
@@ -70,59 +66,42 @@ msgstr ""
 "L'indicateur affichera seulement au maximum le nombre de notifications "
 "indiquées par cette valeur."
 
-#: ../src/indicator-notifications.c:177
+#: ../src/service.c:221
+msgid "from"
+msgstr "de"
+
+#: ../src/service.c:270 ../src/service.c:299
 msgid "Notifications"
 msgstr "Notifications"
 
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-#, fuzzy
-msgid "Settings…"
-msgstr "Paramètres…"
-
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] "Effacer <small>(%d notification)</small>"
-msgstr[1] "Effacer <small>(%d notifications)</small>"
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
-msgstr "Paramètres de l'indicateur de notifications"
-
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
-msgstr "Masquer l'indicateur"
+#: ../src/service.c:327
+msgid "Clear"
+msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
 
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
+#, fuzzy
+#~ msgid "Settings…"
+#~ msgstr "Paramètres…"
 
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr "Nombre maximal de notifications visibles"
+#~ msgid "Clear <small>(%d Notification)</small>"
+#~ msgid_plural "Clear <small>(%d Notifications)</small>"
+#~ msgstr[0] "Effacer <small>(%d notification)</small>"
+#~ msgstr[1] "Effacer <small>(%d notifications)</small>"
 
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr "Enlever"
+#~ msgid "Indicator Notifications Settings"
+#~ msgstr "Paramètres de l'indicateur de notifications"
 
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr "Ajouter"
+#~ msgid "Hide indicator"
+#~ msgstr "Masquer l'indicateur"
 
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr "de"
+#~ msgid "Maximum number of visible notifications"
+#~ msgstr "Nombre maximal de notifications visibles"
+
+#~ msgid "Remove"
+#~ msgstr "Enlever"
+
+#~ msgid "Add"
+#~ msgstr "Ajouter"
diff --git a/po/fr_CA.po b/po/fr_CA.po
index 9efe462..f19ad0b 100644
--- a/po/fr_CA.po
+++ b/po/fr_CA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2020-04-28 11:11+0000\n"
 "Last-Translator: Jeannette L <j.lavoie@net-c.ca>\n"
 "Language-Team: French (Canada) <https://hosted.weblate.org/projects/ayatana-"
@@ -19,9 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 4.0.2\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr "Trier les notifications par le nom de l'application"
 
@@ -34,9 +32,7 @@ msgstr ""
 "Si le nom d'une application est sur la liste noire, toutes les notifications "
 "correspondants au nom de l'application seront ignorées."
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr "Effacer les notifications par un clic du milieu"
 
@@ -70,59 +66,42 @@ msgstr ""
 "L'indicateur affichera seulement au maximum le nombre de notifications "
 "indiquées par cette valeur."
 
-#: ../src/indicator-notifications.c:177
+#: ../src/service.c:221
+msgid "from"
+msgstr "de"
+
+#: ../src/service.c:270 ../src/service.c:299
 msgid "Notifications"
 msgstr "Notifications"
 
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-#, fuzzy
-msgid "Settings…"
-msgstr "Paramètres…"
-
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] "Effacer <small>(%d notification)</small>"
-msgstr[1] "Effacer <small>(%d notifications)</small>"
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
-msgstr "Paramètres de l'indicateur de notifications"
-
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
-msgstr "Masquer l'indicateur"
+#: ../src/service.c:327
+msgid "Clear"
+msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
 
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
+#, fuzzy
+#~ msgid "Settings…"
+#~ msgstr "Paramètres…"
 
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr "Nombre maximal de notifications visibles"
+#~ msgid "Clear <small>(%d Notification)</small>"
+#~ msgid_plural "Clear <small>(%d Notifications)</small>"
+#~ msgstr[0] "Effacer <small>(%d notification)</small>"
+#~ msgstr[1] "Effacer <small>(%d notifications)</small>"
 
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr "Enlever"
+#~ msgid "Indicator Notifications Settings"
+#~ msgstr "Paramètres de l'indicateur de notifications"
 
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr "Ajouter"
+#~ msgid "Hide indicator"
+#~ msgstr "Masquer l'indicateur"
 
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr "de"
+#~ msgid "Maximum number of visible notifications"
+#~ msgstr "Nombre maximal de notifications visibles"
+
+#~ msgid "Remove"
+#~ msgstr "Enlever"
+
+#~ msgid "Add"
+#~ msgstr "Ajouter"
diff --git a/po/frp.po b/po/frp.po
index 4c7d1b6..317f50c 100644
--- a/po/frp.po
+++ b/po/frp.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/fur.po b/po/fur.po
index 20a5446..fb39b23 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 14:59+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/fy.po b/po/fy.po
index b600b00..d110b78 100644
--- a/po/fy.po
+++ b/po/fy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/ga.po b/po/ga.po
index 51c2c1b..0056833 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n==2 ? 1 : 2;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,59 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/gd.po b/po/gd.po
index d6ce2cc..0ca1d7d 100644
--- a/po/gd.po
+++ b/po/gd.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/gl.po b/po/gl.po
index 1095afc..5d84a88 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2018-10-24 17:29+0000\n"
 "Last-Translator: Iván Seoane <ivanrsm1997@gmail.com>\n"
 "Language-Team: Galician <https://hosted.weblate.org/projects/ayatana-"
@@ -19,9 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.3-dev\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr "Desbotar notificacións por nome da aplicación"
 
@@ -34,9 +32,7 @@ msgstr ""
 "Se un nome dunha aplicación está na listaxe negra, desbotaranse tódalas "
 "notificacións que leven ese nome."
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr "Limpa-las notificacións premendo no centro"
 
@@ -70,60 +66,31 @@ msgstr ""
 "O indicador amosará como máximo a morea das notificacións correspondentes a "
 "este valor."
 
-#: ../src/indicator-notifications.c:177
+#: ../src/service.c:221
+msgid "from"
+msgstr "dende"
+
+#: ../src/service.c:270 ../src/service.c:299
 msgid "Notifications"
 msgstr "Notificacións"
 
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] "Limpar <small>(%d notificación)</small>"
-msgstr[1] "Limpar <small>(%d notificacións)</small>"
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
-msgstr ""
-
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-#, fuzzy
-msgid "Hide indicator"
-msgstr "Agocha-lo indicador"
-
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
 
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
+#~ msgid "Clear <small>(%d Notification)</small>"
+#~ msgid_plural "Clear <small>(%d Notifications)</small>"
+#~ msgstr[0] "Limpar <small>(%d notificación)</small>"
+#~ msgstr[1] "Limpar <small>(%d notificacións)</small>"
 
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
 #, fuzzy
-msgid "Maximum number of visible notifications"
-msgstr "Número máximo de elementos visíbeis"
+#~ msgid "Hide indicator"
+#~ msgstr "Agocha-lo indicador"
 
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr "dende"
+#, fuzzy
+#~ msgid "Maximum number of visible notifications"
+#~ msgstr "Número máximo de elementos visíbeis"
diff --git a/po/gu.po b/po/gu.po
index c662645..7116591 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/gv.po b/po/gv.po
index 4ebcfb7..00b95c3 100644
--- a/po/gv.po
+++ b/po/gv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 14:59+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -15,13 +15,11 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n % 10 == 1) ? 0 : ((n % 10 == 2) ? 1 : (("
-"n % 100 == 0 || n % 100 == 20 || n % 100 == 40 || n % 100 == 60 || n % 100 "
+"Plural-Forms: nplurals=4; plural=(n % 10 == 1) ? 0 : ((n % 10 == 2) ? 1 : "
+"((n % 100 == 0 || n % 100 == 20 || n % 100 == 40 || n % 100 == 60 || n % 100 "
 "== 80) ? 2 : 3));\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -31,9 +29,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -62,60 +58,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/he.po b/po/he.po
index 2d9dabf..27562da 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2018-08-06 21:38+0000\n"
 "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
 "Language-Team: Hebrew <https://hosted.weblate.org/projects/ayatana-"
@@ -20,9 +20,7 @@ msgstr ""
 "n % 10 == 0) ? 2 : 3));\n"
 "X-Generator: Weblate 3.1.1\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr "התעלמות מהתראות לפי שם היישומון"
 
@@ -35,9 +33,7 @@ msgstr ""
 "אם שם של יישומון מופיע ברשימת החסימה, כל ההתראות שתואמות לשם היישומון לא "
 "תופענה."
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr "סילוק התראות בלחיצה אמצעית"
 
@@ -68,62 +64,33 @@ msgid ""
 "indicated by this value."
 msgstr "המחוון יציג כמות כזו של התראות לכל היותר בהתאם לערך זה."
 
-#: ../src/indicator-notifications.c:177
+#: ../src/service.c:221
+msgid "from"
+msgstr "מ־"
+
+#: ../src/service.c:270 ../src/service.c:299
 msgid "Notifications"
 msgstr "התראות"
 
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] "סילוק <small>(התראה אחת)</small>"
-msgstr[1] "סילוק <small>(2 התראות)</small>"
-msgstr[2] "סילוק <small>(%d התראות)</small>"
-msgstr[3] "סילוק <small>(%d התראות)</small>"
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
-msgstr ""
-
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-#, fuzzy
-msgid "Hide indicator"
-msgstr "הסתרת המחוון"
-
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
 
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
+#~ msgid "Clear <small>(%d Notification)</small>"
+#~ msgid_plural "Clear <small>(%d Notifications)</small>"
+#~ msgstr[0] "סילוק <small>(התראה אחת)</small>"
+#~ msgstr[1] "סילוק <small>(2 התראות)</small>"
+#~ msgstr[2] "סילוק <small>(%d התראות)</small>"
+#~ msgstr[3] "סילוק <small>(%d התראות)</small>"
 
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
 #, fuzzy
-msgid "Maximum number of visible notifications"
-msgstr "מספר הפריטים הגלויים המרבי"
+#~ msgid "Hide indicator"
+#~ msgstr "הסתרת המחוון"
 
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr "מ־"
+#, fuzzy
+#~ msgid "Maximum number of visible notifications"
+#~ msgstr "מספר הפריטים הגלויים המרבי"
diff --git a/po/hi.po b/po/hi.po
index 6fd94f6..38f055e 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/hr.po b/po/hr.po
index c619ebd..39fa29f 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2020-09-09 01:36+0000\n"
 "Last-Translator: Milo Ivir <mail@milotype.de>\n"
-"Language-Team: Croatian <https://hosted.weblate.org/projects/"
-"ayatana-indicators/notifications-applet/hr/>\n"
+"Language-Team: Croatian <https://hosted.weblate.org/projects/ayatana-"
+"indicators/notifications-applet/hr/>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,9 +20,7 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 4.3-dev\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr "Odbaci obavijesti po imenu programa"
 
@@ -34,9 +32,7 @@ msgstr ""
 "Ako je ime programa na popisu filtra, odbacit će se sve obavijesti koje "
 "odgovaraju imenu programa."
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr "Izbriši obavijesti srednjim klikom"
 
@@ -70,59 +66,45 @@ msgstr ""
 "Indikator će prikazati samo onoliko obavijesti, koliko je naznačeno ovom "
 "vrijednošću."
 
-#: ../src/indicator-notifications.c:177
+#: ../src/service.c:221
+msgid "from"
+msgstr "od"
+
+#: ../src/service.c:270 ../src/service.c:299
 msgid "Notifications"
 msgstr "Obavjesti"
 
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
-msgstr "Postavke …"
-
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] "Izbriši <small>(%d obavijest)</small>"
-msgstr[1] "Izbriši <small>(%d obavijesti)</small>"
-msgstr[2] "Izbriši <small>(%d obavijesti)</small>"
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
-msgstr "Postavke obavijesti indikatora"
-
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
-msgstr "Sakrij indikatora"
+#: ../src/service.c:327
+msgid "Clear"
+msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr "Ne smetaj"
 
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr "Zamijeni „Izbriši” i „Postavke”"
+#~ msgid "Settings…"
+#~ msgstr "Postavke …"
 
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr "Maksimalni broj vidljivih obavijesti"
+#~ msgid "Clear <small>(%d Notification)</small>"
+#~ msgid_plural "Clear <small>(%d Notifications)</small>"
+#~ msgstr[0] "Izbriši <small>(%d obavijest)</small>"
+#~ msgstr[1] "Izbriši <small>(%d obavijesti)</small>"
+#~ msgstr[2] "Izbriši <small>(%d obavijesti)</small>"
 
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr "Ukloni"
+#~ msgid "Indicator Notifications Settings"
+#~ msgstr "Postavke obavijesti indikatora"
 
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr "Dodaj"
+#~ msgid "Hide indicator"
+#~ msgstr "Sakrij indikatora"
 
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr "od"
+#~ msgid "Swap \"Clear\" and \"Settings\" items"
+#~ msgstr "Zamijeni „Izbriši” i „Postavke”"
+
+#~ msgid "Maximum number of visible notifications"
+#~ msgstr "Maksimalni broj vidljivih obavijesti"
+
+#~ msgid "Remove"
+#~ msgstr "Ukloni"
+
+#~ msgid "Add"
+#~ msgstr "Dodaj"
diff --git a/po/ht.po b/po/ht.po
index 1a0a8e3..6d97d29 100644
--- a/po/ht.po
+++ b/po/ht.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 82ad5be..60593fe 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2020-10-25 22:26+0000\n"
 "Last-Translator: Ács Zoltán <acszoltan111@gmail.com>\n"
-"Language-Team: Hungarian <https://hosted.weblate.org/projects/"
-"ayatana-indicators/notifications-applet/hu/>\n"
+"Language-Team: Hungarian <https://hosted.weblate.org/projects/ayatana-"
+"indicators/notifications-applet/hu/>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,9 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.3.2-dev\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr "Értesítések elutasítása az alkalmazásnév alapján"
 
@@ -34,9 +32,7 @@ msgstr ""
 "Ha egy alkalmazás neve rajta van a feketelistán, az összes értesítés amely "
 "egyezik az alkalmazásnévvel el lesz utasítva."
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr "Értesítések törlése középső kattintásra"
 
@@ -67,60 +63,44 @@ msgstr ""
 "Az indikátor legfeljebb az ezen értékkel jelölt értesítések számát jeleníti "
 "meg."
 
-#: ../src/indicator-notifications.c:177
+#: ../src/service.c:221
+#, fuzzy
+msgid "from"
+msgstr "ettől:"
+
+#: ../src/service.c:270 ../src/service.c:299
 msgid "Notifications"
 msgstr "Értesítések"
 
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
-msgstr "Beállítások…"
-
-#: ../src/indicator-notifications.c:522
-#, fuzzy, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] "Törlés: <small>(%d Értesítés)</small>"
-msgstr[1] "Törlés: <small>(%d Értesítés)</small>"
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-#, fuzzy
-msgid "Indicator Notifications Settings"
-msgstr "Indikátor értesítések beállítása"
-
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
-msgstr "Indikátor elrejtése"
+#: ../src/service.c:327
+msgid "Clear"
+msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr "Ne zavarjanak"
 
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
+#~ msgid "Settings…"
+#~ msgstr "Beállítások…"
 
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr "Látható értesítések maximális száma"
+#, fuzzy
+#~ msgid "Clear <small>(%d Notification)</small>"
+#~ msgid_plural "Clear <small>(%d Notifications)</small>"
+#~ msgstr[0] "Törlés: <small>(%d Értesítés)</small>"
+#~ msgstr[1] "Törlés: <small>(%d Értesítés)</small>"
 
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr "Eltávolítás"
+#, fuzzy
+#~ msgid "Indicator Notifications Settings"
+#~ msgstr "Indikátor értesítések beállítása"
 
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr "Hozzáadás"
+#~ msgid "Hide indicator"
+#~ msgstr "Indikátor elrejtése"
 
-#: ../src/notification-menuitem.c:128
-#, fuzzy
-msgid "from"
-msgstr "ettől:"
+#~ msgid "Maximum number of visible notifications"
+#~ msgstr "Látható értesítések maximális száma"
+
+#~ msgid "Remove"
+#~ msgstr "Eltávolítás"
+
+#~ msgid "Add"
+#~ msgstr "Hozzáadás"
diff --git a/po/hy.po b/po/hy.po
index 7adf8de..823a821 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2020-04-02 21:09+0000\n"
 "Last-Translator: Davit Mayilyan <davit.mayilyan@protonmail.ch>\n"
 "Language-Team: Armenian <https://hosted.weblate.org/projects/ayatana-"
@@ -19,9 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 4.0-dev\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr "սև ցուցակ"
 
@@ -31,9 +29,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -62,58 +58,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr "Ծանուցումներ"
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
-msgstr ""
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
+msgstr "Ծանուցումներ"
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/ia.po b/po/ia.po
index 7f3cb89..43b40f7 100644
--- a/po/ia.po
+++ b/po/ia.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/id.po b/po/id.po
index 79c2a26..1fc6a2e 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/is.po b/po/is.po
index 24bbdfb..2805387 100644
--- a/po/is.po
+++ b/po/is.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/it.po b/po/it.po
index 190b20b..339fc81 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2020-10-26 13:13+0000\n"
 "Last-Translator: Michele <miguel2000@livecom.it>\n"
-"Language-Team: Italian <https://hosted.weblate.org/projects/"
-"ayatana-indicators/notifications-applet/it/>\n"
+"Language-Team: Italian <https://hosted.weblate.org/projects/ayatana-"
+"indicators/notifications-applet/it/>\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,9 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.3.2-dev\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr "Elimina le notifiche in base al nome dell'applicazione"
 
@@ -34,9 +32,7 @@ msgstr ""
 "Se il nome di un'applicazione è nella blacklist, tutte le notifiche "
 "corrispondenti al nome dell'applicazione saranno scartate."
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr "Cancella le notifiche con un clic centrale"
 
@@ -70,58 +66,44 @@ msgstr ""
 "L'indicatore visualizzerà al massimo il numero di notifiche indicate da "
 "questo valore."
 
-#: ../src/indicator-notifications.c:177
+#: ../src/service.c:221
+msgid "from"
+msgstr "Da"
+
+#: ../src/service.c:270 ../src/service.c:299
 msgid "Notifications"
 msgstr "Notifiche"
 
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
-msgstr "Impostazioni…"
-
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] "Pulisci <small> (%d Notifica)</small>"
-msgstr[1] "Pulisci <small> (%d Notifiche)</small>"
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
-msgstr "Impostazioni notifiche indicatori"
-
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
-msgstr "Nascondi indicatore"
-
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:327
+msgid "Clear"
+msgstr ""
+
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr "Non disturbare"
 
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr "Scambia gli oggetti \"Pulisci\" e \"Impostazioni\""
+#~ msgid "Settings…"
+#~ msgstr "Impostazioni…"
 
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr "Massimo numero di notifiche visibili"
+#~ msgid "Clear <small>(%d Notification)</small>"
+#~ msgid_plural "Clear <small>(%d Notifications)</small>"
+#~ msgstr[0] "Pulisci <small> (%d Notifica)</small>"
+#~ msgstr[1] "Pulisci <small> (%d Notifiche)</small>"
 
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr "Rimuovi"
+#~ msgid "Indicator Notifications Settings"
+#~ msgstr "Impostazioni notifiche indicatori"
 
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr "Aggiungi"
+#~ msgid "Hide indicator"
+#~ msgstr "Nascondi indicatore"
 
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr "Da"
+#~ msgid "Swap \"Clear\" and \"Settings\" items"
+#~ msgstr "Scambia gli oggetti \"Pulisci\" e \"Impostazioni\""
+
+#~ msgid "Maximum number of visible notifications"
+#~ msgstr "Massimo numero di notifiche visibili"
+
+#~ msgid "Remove"
+#~ msgstr "Rimuovi"
+
+#~ msgid "Add"
+#~ msgstr "Aggiungi"
diff --git a/po/it_CARES.po b/po/it_CARES.po
index b7ec5df..307162d 100644
--- a/po/it_CARES.po
+++ b/po/it_CARES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 14:59+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/ja.po b/po/ja.po
index c47610f..4139e07 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2020-09-07 11:36+0000\n"
 "Last-Translator: Baka Gaijin <lewdwarrior@waifu.club>\n"
-"Language-Team: Japanese <https://hosted.weblate.org/projects/"
-"ayatana-indicators/notifications-applet/ja/>\n"
+"Language-Team: Japanese <https://hosted.weblate.org/projects/ayatana-"
+"indicators/notifications-applet/ja/>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,9 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 4.3-dev\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr "アプリケーション名で通知を破棄する"
 
@@ -34,9 +32,7 @@ msgstr ""
 "アプリケーション名がブラックリストにある場合、アプリケーション名に一致するす"
 "べての通知は破棄されます。"
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr "中ボタンクリックで通知をクリアする"
 
@@ -68,59 +64,38 @@ msgid ""
 "indicated by this value."
 msgstr "インジケーターは、この値で示される通知の数だけを表示します。"
 
-#: ../src/indicator-notifications.c:177
+#: ../src/service.c:221
+#, fuzzy
+msgid "from"
+msgstr "から"
+
+#: ../src/service.c:270 ../src/service.c:299
 msgid "Notifications"
 msgstr "通知"
 
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-#, fuzzy
-msgid "Settings…"
-msgstr "設定..."
-
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
-msgstr "インジケーター通知設定"
-
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
-msgstr "インジケーターを非表示"
-
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
-msgid "Do not disturb"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
+#: ../src/service.c:338
+msgid "Do not disturb"
 msgstr ""
 
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr "表示可能な通知の最大数"
+#, fuzzy
+#~ msgid "Settings…"
+#~ msgstr "設定..."
 
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr "削除"
+#~ msgid "Indicator Notifications Settings"
+#~ msgstr "インジケーター通知設定"
 
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr "追加する"
+#~ msgid "Hide indicator"
+#~ msgstr "インジケーターを非表示"
 
-#: ../src/notification-menuitem.c:128
-#, fuzzy
-msgid "from"
-msgstr "から"
+#~ msgid "Maximum number of visible notifications"
+#~ msgstr "表示可能な通知の最大数"
+
+#~ msgid "Remove"
+#~ msgstr "削除"
+
+#~ msgid "Add"
+#~ msgstr "追加する"
diff --git a/po/ka.po b/po/ka.po
index 0c38674..8be1635 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/kk.po b/po/kk.po
index b31d1f6..ebd6a46 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/kl.po b/po/kl.po
index 80dfb4a..cbf8244 100644
--- a/po/kl.po
+++ b/po/kl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/km.po b/po/km.po
index ae8c2de..2db6085 100644
--- a/po/km.po
+++ b/po/km.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/kn.po b/po/kn.po
index 78509e9..9457275 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/ko.po b/po/ko.po
index 9c81b88..7ed2028 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2020-06-15 04:41+0000\n"
 "Last-Translator: MarongHappy <daemul72@gmail.com>\n"
 "Language-Team: Korean <https://hosted.weblate.org/projects/ayatana-"
@@ -19,9 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 4.1-dev\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr "응용프로그램 이름별 알림 삭제"
 
@@ -34,9 +32,7 @@ msgstr ""
 "응용프로그램 이름이 블랙리스트에 있으면 응용프로그램 이름과 일치하는 모든 알"
 "림이 삭제됩니다."
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr "가운데 클릭시 알림 지우기"
 
@@ -67,58 +63,41 @@ msgid ""
 "indicated by this value."
 msgstr "표시기는 이 값으로 표시된 최대 알림 수만 표시합니다."
 
-#: ../src/indicator-notifications.c:177
+#: ../src/service.c:221
+msgid "from"
+msgstr ""
+
+#: ../src/service.c:270 ../src/service.c:299
 msgid "Notifications"
 msgstr "알림"
 
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-#, fuzzy
-msgid "Settings…"
-msgstr "설정..."
-
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] "지우기 <small>(%d 알림)</small>"
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
-msgstr "표시기 알림 설정"
-
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
-msgstr "표시기 숨김"
+#: ../src/service.c:327
+msgid "Clear"
+msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
 
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
+#, fuzzy
+#~ msgid "Settings…"
+#~ msgstr "설정..."
 
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr "표시되는 알림의 최대 개수"
+#~ msgid "Clear <small>(%d Notification)</small>"
+#~ msgid_plural "Clear <small>(%d Notifications)</small>"
+#~ msgstr[0] "지우기 <small>(%d 알림)</small>"
 
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr "제거"
+#~ msgid "Indicator Notifications Settings"
+#~ msgstr "표시기 알림 설정"
 
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr "추가"
+#~ msgid "Hide indicator"
+#~ msgstr "표시기 숨김"
 
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
+#~ msgid "Maximum number of visible notifications"
+#~ msgstr "표시되는 알림의 최대 개수"
+
+#~ msgid "Remove"
+#~ msgstr "제거"
+
+#~ msgid "Add"
+#~ msgstr "추가"
diff --git a/po/ku.po b/po/ku.po
index 0036638..bda3735 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/kw.po b/po/kw.po
index b1c0e80..e6c1f86 100644
--- a/po/kw.po
+++ b/po/kw.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/ky.po b/po/ky.po
index 420db10..c3fa998 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/la.po b/po/la.po
index 9edf16a..4712368 100644
--- a/po/la.po
+++ b/po/la.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/lb.po b/po/lb.po
index afc4b0e..d169b31 100644
--- a/po/lb.po
+++ b/po/lb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/lo.po b/po/lo.po
index fdeef7d..35f1132 100644
--- a/po/lo.po
+++ b/po/lo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/lt.po b/po/lt.po
index 6c9a5c9..a333e43 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2020-09-05 16:36+0000\n"
 "Last-Translator: Rokas Kasnauskas <rokas.kasnauskas@gmail.com>\n"
-"Language-Team: Lithuanian <https://hosted.weblate.org/projects/"
-"ayatana-indicators/notifications-applet/lt/>\n"
+"Language-Team: Lithuanian <https://hosted.weblate.org/projects/ayatana-"
+"indicators/notifications-applet/lt/>\n"
 "Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,9 +20,7 @@ msgstr ""
 "%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Weblate 4.3-dev\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr "Atmesti pranešimus pagal programos pavadinimą"
 
@@ -35,9 +33,7 @@ msgstr ""
 "Jei programa yra juodajame sąraše, tuomet visi programą atitinkantys "
 "pranešimai bus atmetami."
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr "Išvalyti pranešimus, spustelėjus vidurinįjį pelės mygtuką"
 
@@ -71,59 +67,42 @@ msgstr ""
 "Indikatorius daugiausiai rodys tiek pranešimų, kiek yra nurodyta šioje "
 "reikšmėje."
 
-#: ../src/indicator-notifications.c:177
+#: ../src/service.c:221
+msgid "from"
+msgstr "iš"
+
+#: ../src/service.c:270 ../src/service.c:299
 msgid "Notifications"
 msgstr "Pranešimai"
 
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
-msgstr "Nustatymai…"
-
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] "Išvalyti <small>(%d pranešimą)</small>"
-msgstr[1] "Išvalyti <small>(%d pranešimus)</small>"
-msgstr[2] "Išvalyti <small>(%d pranešimų)</small>"
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
-msgstr "Indikatoriaus pranešimų nustatymai"
-
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
-msgstr "Slėpti indikatorių"
+#: ../src/service.c:327
+msgid "Clear"
+msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr "Netrūkdyti"
 
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
+#~ msgid "Settings…"
+#~ msgstr "Nustatymai…"
 
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr "Didžiausias matomų pranešimų skaičius"
+#~ msgid "Clear <small>(%d Notification)</small>"
+#~ msgid_plural "Clear <small>(%d Notifications)</small>"
+#~ msgstr[0] "Išvalyti <small>(%d pranešimą)</small>"
+#~ msgstr[1] "Išvalyti <small>(%d pranešimus)</small>"
+#~ msgstr[2] "Išvalyti <small>(%d pranešimų)</small>"
 
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr "Šalinti"
+#~ msgid "Indicator Notifications Settings"
+#~ msgstr "Indikatoriaus pranešimų nustatymai"
 
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr "Pridėti"
+#~ msgid "Hide indicator"
+#~ msgstr "Slėpti indikatorių"
 
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr "iš"
+#~ msgid "Maximum number of visible notifications"
+#~ msgstr "Didžiausias matomų pranešimų skaičius"
+
+#~ msgid "Remove"
+#~ msgstr "Šalinti"
+
+#~ msgid "Add"
+#~ msgstr "Pridėti"
diff --git a/po/lv.po b/po/lv.po
index 99b3aac..8b959c7 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,9 +18,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
 "2);\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -30,9 +28,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -61,59 +57,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/mg.po b/po/mg.po
index a9cf377..2e8d86e 100644
--- a/po/mg.po
+++ b/po/mg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/mhr.po b/po/mhr.po
index cef3d9b..e6c4f69 100644
--- a/po/mhr.po
+++ b/po/mhr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/mi.po b/po/mi.po
index 0258811..2317e50 100644
--- a/po/mi.po
+++ b/po/mi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/mk.po b/po/mk.po
index a4a804f..92e5b7d 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 14:59+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n==1 || n%10==1 ? 0 : 1;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/ml.po b/po/ml.po
index d1db35c..8f5af9a 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/mr.po b/po/mr.po
index 60f13b2..50d181f 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/ms.po b/po/ms.po
index 2abdf01..89182c2 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2020-09-05 16:36+0000\n"
 "Last-Translator: antuketot76 <antuketot76@protonmail.com>\n"
 "Language-Team: Malay <https://hosted.weblate.org/projects/ayatana-indicators/"
@@ -19,9 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 4.3-dev\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr "Notifikasi dinyahkan mengikut nama aplikasi"
 
@@ -33,9 +31,7 @@ msgstr ""
 "Jika nama aplikasi didalam senarai, semua notifikasi yang sepadan dengan "
 "nama aplikasi akan dinyahkan."
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr "Padam notifikasi dengan klik pertengahan"
 
@@ -69,57 +65,43 @@ msgstr ""
 "Indikator akan dipaparkan hanya jika semua nombor notifikasi ditandakan "
 "mengikut nilai ini."
 
-#: ../src/indicator-notifications.c:177
+#: ../src/service.c:221
+msgid "from"
+msgstr "daripada"
+
+#: ../src/service.c:270 ../src/service.c:299
 msgid "Notifications"
 msgstr "Notifikasi"
 
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
-msgstr "Seting…"
-
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] "Padam <small>(%d Notifikasi)</small>"
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
-msgstr "Seting Indikator Notifikasi"
-
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
-msgstr "Sembunyi indikator"
-
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:327
+msgid "Clear"
+msgstr ""
+
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr "Jangan Ganggu"
 
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr "Tukar \"Padam\" dan \"Seting\" item"
+#~ msgid "Settings…"
+#~ msgstr "Seting…"
 
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr "Jumlah maksimum notifikasi kelihatan"
+#~ msgid "Clear <small>(%d Notification)</small>"
+#~ msgid_plural "Clear <small>(%d Notifications)</small>"
+#~ msgstr[0] "Padam <small>(%d Notifikasi)</small>"
 
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr "Keluarkan"
+#~ msgid "Indicator Notifications Settings"
+#~ msgstr "Seting Indikator Notifikasi"
 
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr "Tambah"
+#~ msgid "Hide indicator"
+#~ msgstr "Sembunyi indikator"
 
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr "daripada"
+#~ msgid "Swap \"Clear\" and \"Settings\" items"
+#~ msgstr "Tukar \"Padam\" dan \"Seting\" item"
+
+#~ msgid "Maximum number of visible notifications"
+#~ msgstr "Jumlah maksimum notifikasi kelihatan"
+
+#~ msgid "Remove"
+#~ msgstr "Keluarkan"
+
+#~ msgid "Add"
+#~ msgstr "Tambah"
diff --git a/po/my.po b/po/my.po
index a7db1ef..558356d 100644
--- a/po/my.po
+++ b/po/my.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/nb.po b/po/nb.po
index ce4fc8e..6a19c0b 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2020-11-12 08:28+0000\n"
 "Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
-"Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/"
-"ayatana-indicators/notifications-applet/nb_NO/>\n"
+"Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/ayatana-"
+"indicators/notifications-applet/nb_NO/>\n"
 "Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,9 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.4-dev\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 #, fuzzy
 msgid "Discard notifications by application name"
 msgstr "Forkast merknader etter programnavn"
@@ -35,9 +33,7 @@ msgstr ""
 "Hvis et progamnavn er på svartelista, vil alle merknader som samsvarer med "
 "det bli forkastet."
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr "Tøm merknader ved midtklikk"
 
@@ -71,61 +67,47 @@ msgstr ""
 "Indikatoren vil kun vise i meste fall antall merknader angitt av denne "
 "verdien."
 
-#: ../src/indicator-notifications.c:177
+#: ../src/service.c:221
+msgid "from"
+msgstr "fra"
+
+#: ../src/service.c:270 ../src/service.c:299
 msgid "Notifications"
 msgstr "Merknader"
 
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-#, fuzzy
-msgid "Settings…"
-msgstr "Innstillinger..."
-
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] "Tøm <small>%d merknad)</small>"
-msgstr[1] "Tøm <small>%d merknader)</small>"
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
-msgstr "Merknadsinnstillinger for indikator"
-
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
-msgstr "Skjul indikatoren"
+#: ../src/service.c:327
+msgid "Clear"
+msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr "Ikke forstyrr"
 
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
 #, fuzzy
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr "Bytt \"Tøm\"- og \"Innstillinger\"-elementene"
+#~ msgid "Settings…"
+#~ msgstr "Innstillinger..."
+
+#~ msgid "Clear <small>(%d Notification)</small>"
+#~ msgid_plural "Clear <small>(%d Notifications)</small>"
+#~ msgstr[0] "Tøm <small>%d merknad)</small>"
+#~ msgstr[1] "Tøm <small>%d merknader)</small>"
+
+#~ msgid "Indicator Notifications Settings"
+#~ msgstr "Merknadsinnstillinger for indikator"
+
+#~ msgid "Hide indicator"
+#~ msgstr "Skjul indikatoren"
 
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
 #, fuzzy
-msgid "Maximum number of visible notifications"
-msgstr "Maksimer antall synlige elementer"
+#~ msgid "Swap \"Clear\" and \"Settings\" items"
+#~ msgstr "Bytt \"Tøm\"- og \"Innstillinger\"-elementene"
 
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr "Fjern"
+#, fuzzy
+#~ msgid "Maximum number of visible notifications"
+#~ msgstr "Maksimer antall synlige elementer"
 
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr "Legg til"
+#~ msgid "Remove"
+#~ msgstr "Fjern"
 
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr "fra"
+#~ msgid "Add"
+#~ msgstr "Legg til"
diff --git a/po/ne.po b/po/ne.po
index 11375b1..e2bbdbd 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/nl.po b/po/nl.po
index d0b4c1b..a368e81 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2019-08-29 05:54+0000\n"
 "Last-Translator: Heimen Stoffels <vistausss@outlook.com>\n"
 "Language-Team: Dutch <https://hosted.weblate.org/projects/ayatana-indicators/"
@@ -19,9 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.9-dev\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr "Meldingen verwerpen op basis van toepassingsnaam"
 
@@ -34,9 +32,7 @@ msgstr ""
 "Als een toepassing op de zwarte lijst staat, dan worden alle meldingen die "
 "overeenkomen met de naam verworpen."
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr "Meldingen wissen met middelste muisknop"
 
@@ -70,59 +66,42 @@ msgid ""
 msgstr ""
 "De indicator zal niet meer meldingen tonen dan het hier opgegeven aantal."
 
-#: ../src/indicator-notifications.c:177
+#: ../src/service.c:221
+msgid "from"
+msgstr "van"
+
+#: ../src/service.c:270 ../src/service.c:299
 msgid "Notifications"
 msgstr "Meldingen"
 
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-#, fuzzy
-msgid "Settings…"
-msgstr "Instellingen..."
-
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] "<small>(%d melding)</small> wissen"
-msgstr[1] "<small>(%d meldingen)</small> wissen"
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
-msgstr "Indicatorinstellingen"
-
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
-msgstr "Indicator verbergen"
+#: ../src/service.c:327
+msgid "Clear"
+msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
 
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
+#, fuzzy
+#~ msgid "Settings…"
+#~ msgstr "Instellingen..."
 
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr "Maximaal aantal te tonen meldingen"
+#~ msgid "Clear <small>(%d Notification)</small>"
+#~ msgid_plural "Clear <small>(%d Notifications)</small>"
+#~ msgstr[0] "<small>(%d melding)</small> wissen"
+#~ msgstr[1] "<small>(%d meldingen)</small> wissen"
 
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr "Verwijderen"
+#~ msgid "Indicator Notifications Settings"
+#~ msgstr "Indicatorinstellingen"
 
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr "Toevoegen"
+#~ msgid "Hide indicator"
+#~ msgstr "Indicator verbergen"
 
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr "van"
+#~ msgid "Maximum number of visible notifications"
+#~ msgstr "Maximaal aantal te tonen meldingen"
+
+#~ msgid "Remove"
+#~ msgstr "Verwijderen"
+
+#~ msgid "Add"
+#~ msgstr "Toevoegen"
diff --git a/po/nn.po b/po/nn.po
index cc5ea97..74196e5 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/ny.po b/po/ny.po
index 07d4f0a..6c0d032 100644
--- a/po/ny.po
+++ b/po/ny.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 14:59+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/oc.po b/po/oc.po
index 245426e..1cdb4f5 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2020-10-12 09:26+0000\n"
 "Last-Translator: Quentin PAGÈS <quentinantonin@free.fr>\n"
-"Language-Team: Occitan <https://hosted.weblate.org/projects/"
-"ayatana-indicators/notifications-applet/oc/>\n"
+"Language-Team: Occitan <https://hosted.weblate.org/projects/ayatana-"
+"indicators/notifications-applet/oc/>\n"
 "Language: oc\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,9 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 4.3-dev\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr "Escarta las notificacions per nom d'aplicacion"
 
@@ -33,9 +31,7 @@ msgstr ""
 "Se lo nom d'una aplicacion es dins la lista negra, s'escartaràn totas las "
 "notificacions amb lo nom d'aquela aplicacion."
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr "Escafar las notificacions amb un clic del mitan"
 
@@ -68,58 +64,44 @@ msgid ""
 msgstr ""
 "L‘indicator mostrarà pas que lo nombre maximum indicat de notificacions."
 
-#: ../src/indicator-notifications.c:177
+#: ../src/service.c:221
+msgid "from"
+msgstr "de"
+
+#: ../src/service.c:270 ../src/service.c:299
 msgid "Notifications"
 msgstr "Notificacions"
 
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
-msgstr "Configuracion…"
-
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] "Escafar <small>(%d notificacion)</small>"
-msgstr[1] "Escafar <small>(%d notificacions)</small>"
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
-msgstr "Configuracion del menú de notificacions"
-
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
-msgstr "Amagar l’indicator"
+#: ../src/service.c:327
+msgid "Clear"
+msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr "Me desrengar pas"
 
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr "Intervertir los elements « Escafar » e « Configuracion »"
+#~ msgid "Settings…"
+#~ msgstr "Configuracion…"
 
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr "Nombre maximum de notificacions visiblas"
+#~ msgid "Clear <small>(%d Notification)</small>"
+#~ msgid_plural "Clear <small>(%d Notifications)</small>"
+#~ msgstr[0] "Escafar <small>(%d notificacion)</small>"
+#~ msgstr[1] "Escafar <small>(%d notificacions)</small>"
 
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr "Tirar"
+#~ msgid "Indicator Notifications Settings"
+#~ msgstr "Configuracion del menú de notificacions"
 
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr "Ajustar"
+#~ msgid "Hide indicator"
+#~ msgstr "Amagar l’indicator"
 
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr "de"
+#~ msgid "Swap \"Clear\" and \"Settings\" items"
+#~ msgstr "Intervertir los elements « Escafar » e « Configuracion »"
+
+#~ msgid "Maximum number of visible notifications"
+#~ msgstr "Nombre maximum de notificacions visiblas"
+
+#~ msgid "Remove"
+#~ msgstr "Tirar"
+
+#~ msgid "Add"
+#~ msgstr "Ajustar"
diff --git a/po/os.po b/po/os.po
index 747703e..8183697 100644
--- a/po/os.po
+++ b/po/os.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/pa.po b/po/pa.po
index 53b5bb0..96e64b4 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 0c42dd3..50ce9d2 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2019-10-08 16:58+0000\n"
 "Last-Translator: Mateusz Rumiński <matt.ruminski@protonmail.com>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/ayatana-"
@@ -20,9 +20,7 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 3.9-dev\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr "Odrzuć powiadomienia według nazwy aplikacji"
 
@@ -35,9 +33,7 @@ msgstr ""
 "Jeśli nazwa aplikacji znajduje się na czarnej liście, wszystkie "
 "powiadomienia pasujące do nazwy aplikacji zostaną odrzucone."
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr "Wyczyść powiadomienia za pomocą środkowego kliknięcia"
 
@@ -71,60 +67,43 @@ msgstr ""
 "Wskaźnik będzie wyświetlał co najwyżej liczbę powiadomień wskazanych przez "
 "tę wartość."
 
-#: ../src/indicator-notifications.c:177
+#: ../src/service.c:221
+msgid "from"
+msgstr "od"
+
+#: ../src/service.c:270 ../src/service.c:299
 msgid "Notifications"
 msgstr "Powiadomienia"
 
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-#, fuzzy
-msgid "Settings…"
-msgstr "Ustawienia..."
-
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] "Wyczyść <small>(%d Powiadomienie)</small>"
-msgstr[1] "Wyczyść <small>(%d Powiadomienia)</small>"
-msgstr[2] "Wyczyszczenie <small>(%d Powiadomień)</small>"
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
-msgstr "Ustawienia wskaźnika powiadomień"
-
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
-msgstr "Ukryj wskaźnik"
+#: ../src/service.c:327
+msgid "Clear"
+msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
 
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
+#, fuzzy
+#~ msgid "Settings…"
+#~ msgstr "Ustawienia..."
 
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr "Maksymalna liczba widocznych powiadomień"
+#~ msgid "Clear <small>(%d Notification)</small>"
+#~ msgid_plural "Clear <small>(%d Notifications)</small>"
+#~ msgstr[0] "Wyczyść <small>(%d Powiadomienie)</small>"
+#~ msgstr[1] "Wyczyść <small>(%d Powiadomienia)</small>"
+#~ msgstr[2] "Wyczyszczenie <small>(%d Powiadomień)</small>"
 
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr "Usuń"
+#~ msgid "Indicator Notifications Settings"
+#~ msgstr "Ustawienia wskaźnika powiadomień"
 
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr "Dodaj"
+#~ msgid "Hide indicator"
+#~ msgstr "Ukryj wskaźnik"
 
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr "od"
+#~ msgid "Maximum number of visible notifications"
+#~ msgstr "Maksymalna liczba widocznych powiadomień"
+
+#~ msgid "Remove"
+#~ msgstr "Usuń"
+
+#~ msgid "Add"
+#~ msgstr "Dodaj"
diff --git a/po/ps.po b/po/ps.po
index 505595b..54fd141 100644
--- a/po/ps.po
+++ b/po/ps.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/pt.po b/po/pt.po
index 6c83f0f..eb0d446 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2019-12-22 00:21+0000\n"
 "Last-Translator: DHU <lordplayhd@gmail.com>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/ayatana-"
@@ -19,9 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 3.10\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr "Descartar notificações pelo nome da aplicação"
 
@@ -34,9 +32,7 @@ msgstr ""
 "Se um nome de uma aplicação estiver na lista negra, todas as notificações "
 "que correspondam a esse nome serão descartadas."
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr "Apagar notificações ao apertar o botão do meio"
 
@@ -70,59 +66,42 @@ msgstr ""
 "O indicador mostrará no máximo o número de notificações indicado por este "
 "valor."
 
-#: ../src/indicator-notifications.c:177
+#: ../src/service.c:221
+msgid "from"
+msgstr "de"
+
+#: ../src/service.c:270 ../src/service.c:299
 msgid "Notifications"
 msgstr "Notificações"
 
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-#, fuzzy
-msgid "Settings…"
-msgstr "Configurações..."
-
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] "Limpar <small>(%d notificação)</small>"
-msgstr[1] "Limpar <small>(%d notificações)</small>"
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
-msgstr "Configuração de notificações do indicador"
-
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
-msgstr "Ocultar código"
-
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
-msgid "Do not disturb"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
+#: ../src/service.c:338
+msgid "Do not disturb"
 msgstr ""
 
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr "Número máximo de notificações visíveis"
+#, fuzzy
+#~ msgid "Settings…"
+#~ msgstr "Configurações..."
 
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr "Remover"
+#~ msgid "Clear <small>(%d Notification)</small>"
+#~ msgid_plural "Clear <small>(%d Notifications)</small>"
+#~ msgstr[0] "Limpar <small>(%d notificação)</small>"
+#~ msgstr[1] "Limpar <small>(%d notificações)</small>"
 
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr "Adicionar"
+#~ msgid "Indicator Notifications Settings"
+#~ msgstr "Configuração de notificações do indicador"
 
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr "de"
+#~ msgid "Hide indicator"
+#~ msgstr "Ocultar código"
+
+#~ msgid "Maximum number of visible notifications"
+#~ msgstr "Número máximo de notificações visíveis"
+
+#~ msgid "Remove"
+#~ msgstr "Remover"
+
+#~ msgid "Add"
+#~ msgstr "Adicionar"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5a06876..e00b0b2 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2020-02-26 16:33+0000\n"
 "Last-Translator: Wellington Terumi Uemura <wellingtonuemura@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
@@ -19,9 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 4.0-dev\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr "Descartar notificações por nome de aplicação"
 
@@ -34,9 +32,7 @@ msgstr ""
 "Se um nome de aplicativo estiver na lista negra, será descartada qualquer "
 "notificação que corresponda ao nome do aplicativo."
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr "Clique com o botão do meio para limpar as notificações"
 
@@ -70,59 +66,42 @@ msgstr ""
 "O indicador só exibirá, no máximo, a quantidade de notificações definido por "
 "este valor."
 
-#: ../src/indicator-notifications.c:177
+#: ../src/service.c:221
+msgid "from"
+msgstr "de"
+
+#: ../src/service.c:270 ../src/service.c:299
 msgid "Notifications"
 msgstr "Notificações"
 
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-#, fuzzy
-msgid "Settings…"
-msgstr "Configurações..."
-
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] "Limpar a <small>(%d Notificação)</small>"
-msgstr[1] "Limpar as <small>(%d Notificações)</small>"
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
-msgstr "Configuração de Notificações do Indicador"
-
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
-msgstr "Ocultar indicador"
-
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
-msgid "Do not disturb"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
+#: ../src/service.c:338
+msgid "Do not disturb"
 msgstr ""
 
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr "Quantidade máxima de notificações visíveis"
+#, fuzzy
+#~ msgid "Settings…"
+#~ msgstr "Configurações..."
 
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr "Remover"
+#~ msgid "Clear <small>(%d Notification)</small>"
+#~ msgid_plural "Clear <small>(%d Notifications)</small>"
+#~ msgstr[0] "Limpar a <small>(%d Notificação)</small>"
+#~ msgstr[1] "Limpar as <small>(%d Notificações)</small>"
 
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr "Adicionar"
+#~ msgid "Indicator Notifications Settings"
+#~ msgstr "Configuração de Notificações do Indicador"
 
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr "de"
+#~ msgid "Hide indicator"
+#~ msgstr "Ocultar indicador"
+
+#~ msgid "Maximum number of visible notifications"
+#~ msgstr "Quantidade máxima de notificações visíveis"
+
+#~ msgid "Remove"
+#~ msgstr "Remover"
+
+#~ msgid "Add"
+#~ msgstr "Adicionar"
diff --git a/po/ro.po b/po/ro.po
index 742ace0..ca49569 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2020-03-29 14:40+0000\n"
 "Last-Translator: Alexie Brindusescu <alexiedb@yahoo.com>\n"
 "Language-Team: Romanian <https://hosted.weblate.org/projects/ayatana-"
@@ -20,9 +20,7 @@ msgstr ""
 "20)) ? 1 : 2;\n"
 "X-Generator: Weblate 4.0-dev\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr "Renunțare la notificările prin numele aplicației"
 
@@ -35,9 +33,7 @@ msgstr ""
 "Dacă un nume de aplicație se află în lista neagră, toate notificările care "
 "se potrivesc cu numele aplicației vor fi ignorate."
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr "Ștergeți notificările la clic pe mijloc"
 
@@ -72,62 +68,45 @@ msgstr ""
 "Indicatorul va afișa cel mult numărul de notificări indicate de această "
 "valoare."
 
-#: ../src/indicator-notifications.c:177
+#: ../src/service.c:221
+msgid "from"
+msgstr "de la"
+
+#: ../src/service.c:270 ../src/service.c:299
 msgid "Notifications"
 msgstr "Notificări"
 
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-#, fuzzy
-msgid "Settings…"
-msgstr "Setari..."
-
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] "Stergeţi <small>(%d notificări)</small>"
-msgstr[1] "Stergeţi <small>(%d notificări)</small>"
-msgstr[2] "Stergeţi <small>(%d notificări)</small>"
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
-msgstr "Setari ale indicatorului de notificari"
-
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-#, fuzzy
-msgid "Hide indicator"
-msgstr "Ascundeţi indicatorul"
+#: ../src/service.c:327
+msgid "Clear"
+msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
 
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
+#, fuzzy
+#~ msgid "Settings…"
+#~ msgstr "Setari..."
+
+#~ msgid "Clear <small>(%d Notification)</small>"
+#~ msgid_plural "Clear <small>(%d Notifications)</small>"
+#~ msgstr[0] "Stergeţi <small>(%d notificări)</small>"
+#~ msgstr[1] "Stergeţi <small>(%d notificări)</small>"
+#~ msgstr[2] "Stergeţi <small>(%d notificări)</small>"
+
+#~ msgid "Indicator Notifications Settings"
+#~ msgstr "Setari ale indicatorului de notificari"
 
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
 #, fuzzy
-msgid "Maximum number of visible notifications"
-msgstr "Numărul maxim de elemente vizibile"
+#~ msgid "Hide indicator"
+#~ msgstr "Ascundeţi indicatorul"
 
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr "Elimina"
+#, fuzzy
+#~ msgid "Maximum number of visible notifications"
+#~ msgstr "Numărul maxim de elemente vizibile"
 
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr "Adauga"
+#~ msgid "Remove"
+#~ msgstr "Elimina"
 
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr "de la"
+#~ msgid "Add"
+#~ msgstr "Adauga"
diff --git a/po/ru.po b/po/ru.po
index 088e143..883be4a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2020-10-09 11:26+0000\n"
 "Last-Translator: koffevar <egor.kafisov@gmail.com>\n"
-"Language-Team: Russian <https://hosted.weblate.org/projects/"
-"ayatana-indicators/notifications-applet/ru/>\n"
+"Language-Team: Russian <https://hosted.weblate.org/projects/ayatana-"
+"indicators/notifications-applet/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,9 +20,7 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 4.3-dev\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr "Игнорировать уведомления по названию приложения"
 
@@ -34,9 +32,7 @@ msgstr ""
 "Если название приложения в чёрном списке, все уведомления от приложения с "
 "этим названием будут проигнорированы."
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr "Очистить уведомления по средней кнопке мыши"
 
@@ -68,59 +64,45 @@ msgid ""
 "indicated by this value."
 msgstr "Индикатор будет отображать уведомлений не более, чем это значение."
 
-#: ../src/indicator-notifications.c:177
+#: ../src/service.c:221
+msgid "from"
+msgstr "от"
+
+#: ../src/service.c:270 ../src/service.c:299
 msgid "Notifications"
 msgstr "Уведомления"
 
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
-msgstr "Настройки…"
-
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] "Очистить <small>(%d уведомление)</small>"
-msgstr[1] "Очистить <small>(%d уведомления)</small>"
-msgstr[2] "Очистить <small>(%d уведомлений)</small>"
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
-msgstr "Индикатор Настройки уведомлений"
-
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
-msgstr "Спрятать индикатор"
+#: ../src/service.c:327
+msgid "Clear"
+msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr "Не беспокоить"
 
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr "Поменять местами элементы \"Очистить\" и \"Настройки\""
+#~ msgid "Settings…"
+#~ msgstr "Настройки…"
 
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr "Максимальное количество уведомлений"
+#~ msgid "Clear <small>(%d Notification)</small>"
+#~ msgid_plural "Clear <small>(%d Notifications)</small>"
+#~ msgstr[0] "Очистить <small>(%d уведомление)</small>"
+#~ msgstr[1] "Очистить <small>(%d уведомления)</small>"
+#~ msgstr[2] "Очистить <small>(%d уведомлений)</small>"
 
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr "Удалить"
+#~ msgid "Indicator Notifications Settings"
+#~ msgstr "Индикатор Настройки уведомлений"
 
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr "Добавить"
+#~ msgid "Hide indicator"
+#~ msgstr "Спрятать индикатор"
 
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr "от"
+#~ msgid "Swap \"Clear\" and \"Settings\" items"
+#~ msgstr "Поменять местами элементы \"Очистить\" и \"Настройки\""
+
+#~ msgid "Maximum number of visible notifications"
+#~ msgstr "Максимальное количество уведомлений"
+
+#~ msgid "Remove"
+#~ msgstr "Удалить"
+
+#~ msgid "Add"
+#~ msgstr "Добавить"
diff --git a/po/sa.po b/po/sa.po
index de323c4..1991899 100644
--- a/po/sa.po
+++ b/po/sa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/sc.po b/po/sc.po
index b0583cb..dc4918d 100644
--- a/po/sc.po
+++ b/po/sc.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2020-10-27 14:36+0000\n"
 "Last-Translator: Adrià Martín <adriamartinmor@gmail.com>\n"
-"Language-Team: Sardinian <https://hosted.weblate.org/projects/"
-"ayatana-indicators/notifications-applet/sc/>\n"
+"Language-Team: Sardinian <https://hosted.weblate.org/projects/ayatana-"
+"indicators/notifications-applet/sc/>\n"
 "Language: sc\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,9 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.3.2-dev\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -31,9 +29,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -62,58 +58,24 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr "Notìficas"
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
-msgstr ""
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
+msgstr "Notìficas"
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
 
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr "Cantzella"
+#~ msgid "Remove"
+#~ msgstr "Cantzella"
 
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr "Agiunghe"
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
+#~ msgid "Add"
+#~ msgstr "Agiunghe"
diff --git a/po/sd.po b/po/sd.po
index ff471b2..5139b5d 100644
--- a/po/sd.po
+++ b/po/sd.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/se.po b/po/se.po
index 650f155..f2b710b 100644
--- a/po/se.po
+++ b/po/se.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/shn.po b/po/shn.po
index 8f6ddc5..8c7e299 100644
--- a/po/shn.po
+++ b/po/shn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/si.po b/po/si.po
index 5a3cb27..178798b 100644
--- a/po/si.po
+++ b/po/si.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/sk.po b/po/sk.po
index 5dd9da1..1538faf 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2020-09-29 04:40+0000\n"
 "Last-Translator: Ján Olexa <jnolexa@gmail.com>\n"
-"Language-Team: Slovak <https://hosted.weblate.org/projects/"
-"ayatana-indicators/notifications-applet/sk/>\n"
+"Language-Team: Slovak <https://hosted.weblate.org/projects/ayatana-"
+"indicators/notifications-applet/sk/>\n"
 "Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,9 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Weblate 4.3-dev\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr "Odstrániť notifikáciu podľa názvu aplikácie"
 
@@ -34,9 +32,7 @@ msgstr ""
 "Ak názov aplikácie je na zozname vylúčených, všetky oznámenia s rovnakým "
 "názvom aplikácie budú odstránené."
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr "Zmazať oznámenie pri kliknutí stredného tlačidla myši"
 
@@ -68,59 +64,45 @@ msgid ""
 "indicated by this value."
 msgstr "Ukazovateľ zobrazí maximálne toľko položiek ako je uvedená hodnota."
 
-#: ../src/indicator-notifications.c:177
+#: ../src/service.c:221
+msgid "from"
+msgstr "z"
+
+#: ../src/service.c:270 ../src/service.c:299
 msgid "Notifications"
 msgstr "Oznámenia"
 
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
-msgstr "Nastavenia…"
-
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] "Vyčistit <small>(%d oznámenie)</small>"
-msgstr[1] "Vyčistit <small>(%d oznámenia)</small>"
-msgstr[2] "Vyčistit <small>(%d oznámení)</small>"
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
-msgstr "Nastavenie notifikácie ukazovateľov"
-
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
-msgstr "Skryť ukazovateľ"
+#: ../src/service.c:327
+msgid "Clear"
+msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr "Nevyrušovať"
 
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr "Výmena položiek \"Vymazať\" a \"Nastavenia\""
+#~ msgid "Settings…"
+#~ msgstr "Nastavenia…"
 
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr "Maximálny počet viditeľných oznámení"
+#~ msgid "Clear <small>(%d Notification)</small>"
+#~ msgid_plural "Clear <small>(%d Notifications)</small>"
+#~ msgstr[0] "Vyčistit <small>(%d oznámenie)</small>"
+#~ msgstr[1] "Vyčistit <small>(%d oznámenia)</small>"
+#~ msgstr[2] "Vyčistit <small>(%d oznámení)</small>"
 
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr "Odstrániť"
+#~ msgid "Indicator Notifications Settings"
+#~ msgstr "Nastavenie notifikácie ukazovateľov"
 
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr "Pridať"
+#~ msgid "Hide indicator"
+#~ msgstr "Skryť ukazovateľ"
 
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr "z"
+#~ msgid "Swap \"Clear\" and \"Settings\" items"
+#~ msgstr "Výmena položiek \"Vymazať\" a \"Nastavenia\""
+
+#~ msgid "Maximum number of visible notifications"
+#~ msgstr "Maximálny počet viditeľných oznámení"
+
+#~ msgid "Remove"
+#~ msgstr "Odstrániť"
+
+#~ msgid "Add"
+#~ msgstr "Pridať"
diff --git a/po/sl.po b/po/sl.po
index 59ddd5b..47e0877 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,9 +18,7 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
 "%100==4 ? 2 : 3);\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -30,9 +28,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -61,60 +57,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/sq.po b/po/sq.po
index 7e413d6..9052440 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2019-11-03 15:03+0000\n"
 "Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
 "Language-Team: Albanian <https://hosted.weblate.org/projects/ayatana-"
@@ -19,9 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.10-dev\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr "Fshij njoftimet në varësi të emrit të sistemit"
 
@@ -34,9 +32,7 @@ msgstr ""
 "Nëse emri i një sistemi është në listë e zezë, të gjithë njoftimet "
 "korrespondente me emrin e sistemit do të fshihen."
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -65,58 +61,27 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
+#: ../src/service.c:221
+msgid "from"
+msgstr "Nga"
+
+#: ../src/service.c:270 ../src/service.c:299
 msgid "Notifications"
 msgstr "Njoftime"
 
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
-msgstr ""
-
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
-msgstr "Fshih-treguesin"
-
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
 
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
+#~ msgid "Hide indicator"
+#~ msgstr "Fshih-treguesin"
 
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr "Fshij"
+#~ msgid "Remove"
+#~ msgstr "Fshij"
 
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr "Shto"
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr "Nga"
+#~ msgid "Add"
+#~ msgstr "Shto"
diff --git a/po/sr.po b/po/sr.po
index 3777e43..53186d7 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,9 +18,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -30,9 +28,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -61,59 +57,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 928458c..412e7ed 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2020-08-30 19:37+0000\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
-"Language-Team: Swedish <https://hosted.weblate.org/projects/"
-"ayatana-indicators/notifications-applet/sv/>\n"
+"Language-Team: Swedish <https://hosted.weblate.org/projects/ayatana-"
+"indicators/notifications-applet/sv/>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,9 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.2.1-dev\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr "Förkasta aviseringar efter programnamn"
 
@@ -33,9 +31,7 @@ msgstr ""
 "Om ett programnamn finns i filterlistan kommer alla aviseringar som matchar "
 "programnamnet att förkastas."
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr "Rensa aviseringar vid mittenklick"
 
@@ -67,58 +63,44 @@ msgid ""
 "indicated by this value."
 msgstr "Indikatorn kommer som mest att visa detta antal aviseringar."
 
-#: ../src/indicator-notifications.c:177
+#: ../src/service.c:221
+msgid "from"
+msgstr "från"
+
+#: ../src/service.c:270 ../src/service.c:299
 msgid "Notifications"
 msgstr "Aviseringar"
 
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
-msgstr "Inställningar…"
-
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] "Rensa <small>(%d avisering)</small>"
-msgstr[1] "Rensa <small>(%d aviseringar)</small>"
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
-msgstr "Inställningar för indikatoraviseringar"
-
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
-msgstr "Göm indikatorn"
+#: ../src/service.c:327
+msgid "Clear"
+msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr "Stör ej"
 
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr "Byt objekten \"Rensa\" och \"Inställningar\""
+#~ msgid "Settings…"
+#~ msgstr "Inställningar…"
 
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr "Maximalt antal synliga aviseringar"
+#~ msgid "Clear <small>(%d Notification)</small>"
+#~ msgid_plural "Clear <small>(%d Notifications)</small>"
+#~ msgstr[0] "Rensa <small>(%d avisering)</small>"
+#~ msgstr[1] "Rensa <small>(%d aviseringar)</small>"
 
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr "Ta bort"
+#~ msgid "Indicator Notifications Settings"
+#~ msgstr "Inställningar för indikatoraviseringar"
 
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr "Lägg till"
+#~ msgid "Hide indicator"
+#~ msgstr "Göm indikatorn"
 
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr "från"
+#~ msgid "Swap \"Clear\" and \"Settings\" items"
+#~ msgstr "Byt objekten \"Rensa\" och \"Inställningar\""
+
+#~ msgid "Maximum number of visible notifications"
+#~ msgstr "Maximalt antal synliga aviseringar"
+
+#~ msgid "Remove"
+#~ msgstr "Ta bort"
+
+#~ msgid "Add"
+#~ msgstr "Lägg till"
diff --git a/po/sw.po b/po/sw.po
index 7c18d16..3b21a99 100644
--- a/po/sw.po
+++ b/po/sw.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/szl.po b/po/szl.po
index e63fb3b..7257611 100644
--- a/po/szl.po
+++ b/po/szl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/ta.po b/po/ta.po
index c779e27..7257305 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2020-01-06 14:21+0000\n"
 "Last-Translator: k Venkatesan kalimoorthy pillySA <venkyvani1975@gmail.com>\n"
 "Language-Team: Tamil <https://hosted.weblate.org/projects/ayatana-indicators/"
@@ -19,9 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.10\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 #, fuzzy
 msgid "Discard notifications by application name"
 msgstr "venkatesan"
@@ -32,9 +30,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -63,58 +59,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/ta_LK.po b/po/ta_LK.po
index 3f6d1c7..fa265a5 100644
--- a/po/ta_LK.po
+++ b/po/ta_LK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 14:59+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/te.po b/po/te.po
index 3e315f4..ede998f 100644
--- a/po/te.po
+++ b/po/te.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2020-09-05 16:36+0000\n"
 "Last-Translator: sai vineeth kumar tumu <saivineethkumartumu@gmail.com>\n"
-"Language-Team: Telugu <https://hosted.weblate.org/projects/"
-"ayatana-indicators/notifications-applet/te/>\n"
+"Language-Team: Telugu <https://hosted.weblate.org/projects/ayatana-"
+"indicators/notifications-applet/te/>\n"
 "Language: te\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,9 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.3-dev\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -31,9 +29,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr "మధ్య క్లిక్‌లో  హెచ్చరికలు తీసివేయండి"
 
@@ -62,59 +58,25 @@ msgid ""
 "indicated by this value."
 msgstr "ఈ విలువ సూచించిన సంఖ్యను మాత్రమే సూచిక ప్రదర్శిస్తుంది."
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
 
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
 #, fuzzy
-msgid "Maximum number of visible notifications"
-msgstr "కనిపించే అంశాల గరిష్ట సంఖ్య"
+#~ msgid "Maximum number of visible notifications"
+#~ msgstr "కనిపించే అంశాల గరిష్ట సంఖ్య"
 
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr "తొలగించు"
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
+#~ msgid "Remove"
+#~ msgstr "తొలగించు"
diff --git a/po/tg.po b/po/tg.po
index 94eddf8..f03b191 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/th.po b/po/th.po
index decc14f..a629de8 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/ti.po b/po/ti.po
index bc79fb0..0f9757e 100644
--- a/po/ti.po
+++ b/po/ti.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 8532d4f..f079bfb 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2020-09-26 17:40+0000\n"
 "Last-Translator: Talking Panda <memredogan3626@gmail.com>\n"
-"Language-Team: Turkish <https://hosted.weblate.org/projects/"
-"ayatana-indicators/notifications-applet/tr/>\n"
+"Language-Team: Turkish <https://hosted.weblate.org/projects/ayatana-"
+"indicators/notifications-applet/tr/>\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,9 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.3-dev\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr "Bildirimleri uygulama adına göre sil"
 
@@ -33,9 +31,7 @@ msgstr ""
 "Bir uygulama adı kara liste içinde ise, uygulama adıyla eşleşen tüm "
 "bildirimleri silinir."
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr "Bildirimleri Orta tuşla temizle"
 
@@ -68,58 +64,44 @@ msgid ""
 msgstr ""
 "Gösterge yalnızca bu değerle belirtilen kadar sayıda bildirim görüntüler."
 
-#: ../src/indicator-notifications.c:177
+#: ../src/service.c:221
+msgid "from"
+msgstr "itibaren"
+
+#: ../src/service.c:270 ../src/service.c:299
 msgid "Notifications"
 msgstr "Bildirimler"
 
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
-msgstr "Ayarlar…"
-
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] "<small>(%d Bildirimi)</small> temizle"
-msgstr[1] "<small>(%d Bildirimleri)</small> temizle"
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
-msgstr "Gösterge bildirim ayarları"
-
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
-msgstr "Göstergeyi gizle"
+#: ../src/service.c:327
+msgid "Clear"
+msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr "Rahatsız Etme"
 
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr "\"Temizle\" ve \"Ayarlar\" öğelerini değiştirin"
+#~ msgid "Settings…"
+#~ msgstr "Ayarlar…"
 
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr "En fazla görünür bildirim sayısı"
+#~ msgid "Clear <small>(%d Notification)</small>"
+#~ msgid_plural "Clear <small>(%d Notifications)</small>"
+#~ msgstr[0] "<small>(%d Bildirimi)</small> temizle"
+#~ msgstr[1] "<small>(%d Bildirimleri)</small> temizle"
 
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr "Sil"
+#~ msgid "Indicator Notifications Settings"
+#~ msgstr "Gösterge bildirim ayarları"
 
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr "Ekle"
+#~ msgid "Hide indicator"
+#~ msgstr "Göstergeyi gizle"
 
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr "itibaren"
+#~ msgid "Swap \"Clear\" and \"Settings\" items"
+#~ msgstr "\"Temizle\" ve \"Ayarlar\" öğelerini değiştirin"
+
+#~ msgid "Maximum number of visible notifications"
+#~ msgstr "En fazla görünür bildirim sayısı"
+
+#~ msgid "Remove"
+#~ msgstr "Sil"
+
+#~ msgid "Add"
+#~ msgstr "Ekle"
diff --git a/po/tt.po b/po/tt.po
index 1e7a6e7..41d30d3 100644
--- a/po/tt.po
+++ b/po/tt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 14:59+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,57 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/ug.po b/po/ug.po
index ef94782..f2082c0 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2020-05-09 06:12+0000\n"
 "Last-Translator: Abdusalam <1810010207@s.upc.edu.cn>\n"
 "Language-Team: Uyghur <https://hosted.weblate.org/projects/ayatana-"
@@ -19,9 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.1-dev\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr "ئىلتىماس نامى بىلەن ئۇقتۇرۇشنى ئەمەلدىن قالدۇرۇڭ"
 
@@ -34,9 +32,7 @@ msgstr ""
 "ئەگەر بىر پروگرامما ئىسمى قارا تىزىملىكتە بولسا ، ئىلتىماس نامىغا ماس "
 "كېلىدىغان بارلىق ئۇقتۇرۇشلار تاشلىۋېتىلىدۇ."
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr "ئوتتۇرا چېكىشتىكى ئۇقتۇرۇشلارنى تازىلاڭ"
 
@@ -69,59 +65,42 @@ msgid ""
 msgstr ""
 "كۆرسەتكۈچ پەقەت بۇ قىممەتتە كۆرسىتىلگەن ئۇقتۇرۇشلارنىڭ سانىنى كۆرسىتىدۇ."
 
-#: ../src/indicator-notifications.c:177
+#: ../src/service.c:221
+msgid "from"
+msgstr "ئەۋەتكۈچى"
+
+#: ../src/service.c:270 ../src/service.c:299
 msgid "Notifications"
 msgstr "ئۇقتۇرۇش"
 
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-#, fuzzy
-msgid "Settings…"
-msgstr "تەڭشەكلەر ..."
-
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] "ئۇقتۇرۇش<small>(%d Notification)</small>نى تازىلاڭ"
-msgstr[1] "ئۇقتۇرۇش<small>(%d Notifications)</small>لارنى تازىلاڭ"
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
-msgstr "كۆرسەتكۈچ ئۇقتۇرۇشى"
-
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
-msgstr "كۆرسەتكۈچنى يوشۇرۇش"
+#: ../src/service.c:327
+msgid "Clear"
+msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
 
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
+#, fuzzy
+#~ msgid "Settings…"
+#~ msgstr "تەڭشەكلەر ..."
 
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr "كۆرۈنگەن ئۇقتۇرۇشلارنىڭ ئەڭ كۆپ سانى"
+#~ msgid "Clear <small>(%d Notification)</small>"
+#~ msgid_plural "Clear <small>(%d Notifications)</small>"
+#~ msgstr[0] "ئۇقتۇرۇش<small>(%d Notification)</small>نى تازىلاڭ"
+#~ msgstr[1] "ئۇقتۇرۇش<small>(%d Notifications)</small>لارنى تازىلاڭ"
 
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr "ئۆچۈرۈش"
+#~ msgid "Indicator Notifications Settings"
+#~ msgstr "كۆرسەتكۈچ ئۇقتۇرۇشى"
 
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr "قوش"
+#~ msgid "Hide indicator"
+#~ msgstr "كۆرسەتكۈچنى يوشۇرۇش"
 
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr "ئەۋەتكۈچى"
+#~ msgid "Maximum number of visible notifications"
+#~ msgstr "كۆرۈنگەن ئۇقتۇرۇشلارنىڭ ئەڭ كۆپ سانى"
+
+#~ msgid "Remove"
+#~ msgstr "ئۆچۈرۈش"
+
+#~ msgid "Add"
+#~ msgstr "قوش"
diff --git a/po/uk.po b/po/uk.po
index ea087e6..7d2d695 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2020-08-07 21:32+0000\n"
 "Last-Translator: Prosta4okua <danyavdele@gmail.com>\n"
 "Language-Team: Ukrainian <https://hosted.weblate.org/projects/ayatana-"
@@ -20,9 +20,7 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 4.2-dev\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr "Ігнорувати сповіщення за назвою застосунку"
 
@@ -35,9 +33,7 @@ msgstr ""
 "Якщо ім'я застосунку в чорному списку, всі сповіщення, що відповідають назві "
 "застосунку, будуть відхилені."
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr "Очистити сповіщення по середній кнопці миші"
 
@@ -69,60 +65,43 @@ msgid ""
 "indicated by this value."
 msgstr "Індикатор буде відображати повідомлень не більше, ніж це значення."
 
-#: ../src/indicator-notifications.c:177
+#: ../src/service.c:221
+msgid "from"
+msgstr "з"
+
+#: ../src/service.c:270 ../src/service.c:299
 msgid "Notifications"
 msgstr "Сповіщення"
 
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-#, fuzzy
-msgid "Settings…"
-msgstr "Налаштування ..."
-
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] "Очистити<small>%d Оповіщення)</small>"
-msgstr[1] "Очистити<small>%d Сповіщення)</small>"
-msgstr[2] "Очистити<small>%d Сповіщень)</small>"
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
-msgstr "Налаштування сповіщень індикаторів"
-
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
-msgstr "Приховати індикатор"
+#: ../src/service.c:327
+msgid "Clear"
+msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
 
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
+#, fuzzy
+#~ msgid "Settings…"
+#~ msgstr "Налаштування ..."
 
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr "Максимальна кількість видимих сповіщень"
+#~ msgid "Clear <small>(%d Notification)</small>"
+#~ msgid_plural "Clear <small>(%d Notifications)</small>"
+#~ msgstr[0] "Очистити<small>%d Оповіщення)</small>"
+#~ msgstr[1] "Очистити<small>%d Сповіщення)</small>"
+#~ msgstr[2] "Очистити<small>%d Сповіщень)</small>"
 
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr "Видалити"
+#~ msgid "Indicator Notifications Settings"
+#~ msgstr "Налаштування сповіщень індикаторів"
 
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr "Додати"
+#~ msgid "Hide indicator"
+#~ msgstr "Приховати індикатор"
 
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr "з"
+#~ msgid "Maximum number of visible notifications"
+#~ msgstr "Максимальна кількість видимих сповіщень"
+
+#~ msgid "Remove"
+#~ msgstr "Видалити"
+
+#~ msgid "Add"
+#~ msgstr "Додати"
diff --git a/po/ur.po b/po/ur.po
index 7e8f9d1..89e9319 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/uz.po b/po/uz.po
index ac616ce..c7c5ca2 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/vec.po b/po/vec.po
index cd33cba..ee9d789 100644
--- a/po/vec.po
+++ b/po/vec.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 14:59+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/vi.po b/po/vi.po
index 13c2238..7c97673 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,57 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/wae.po b/po/wae.po
index a092922..d6e7a46 100644
--- a/po/wae.po
+++ b/po/wae.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/wo.po b/po/wo.po
index 637be3e..1349f53 100644
--- a/po/wo.po
+++ b/po/wo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 14:59+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,57 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ea45555..b1d8520 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2020-05-27 06:41+0000\n"
 "Last-Translator: wdggg <wdggg7@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
@@ -19,9 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 4.1-dev\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr "按应用程序名称屏蔽通知"
 
@@ -32,9 +30,7 @@ msgid ""
 "application name will be discarded."
 msgstr "如果有一个应用程序在黑名单中， 所有与该程序相关的通知将会被丢弃。"
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr "点击鼠标中键以清空通知"
 
@@ -65,58 +61,41 @@ msgid ""
 "indicated by this value."
 msgstr "指示器最多只显示相当于此数值的通知数量。"
 
-#: ../src/indicator-notifications.c:177
+#: ../src/service.c:221
+msgid "from"
+msgstr "从"
+
+#: ../src/service.c:270 ../src/service.c:299
 msgid "Notifications"
 msgstr "通知"
 
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-#, fuzzy
-msgid "Settings…"
-msgstr "设置..."
-
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] "清空 <small>(%d 通知)</small>"
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
-msgstr "指示器通知设置"
-
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
-msgstr "隐藏指示器"
+#: ../src/service.c:327
+msgid "Clear"
+msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
 
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
+#, fuzzy
+#~ msgid "Settings…"
+#~ msgstr "设置..."
 
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr "最大可见通知数量"
+#~ msgid "Clear <small>(%d Notification)</small>"
+#~ msgid_plural "Clear <small>(%d Notifications)</small>"
+#~ msgstr[0] "清空 <small>(%d 通知)</small>"
 
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr "删除"
+#~ msgid "Indicator Notifications Settings"
+#~ msgstr "指示器通知设置"
 
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr "添加"
+#~ msgid "Hide indicator"
+#~ msgstr "隐藏指示器"
 
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr "从"
+#~ msgid "Maximum number of visible notifications"
+#~ msgstr "最大可见通知数量"
+
+#~ msgid "Remove"
+#~ msgstr "删除"
+
+#~ msgid "Add"
+#~ msgstr "添加"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 325cfb0..c11a399 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2017-12-02 19:20+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,9 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr ""
 
@@ -29,9 +27,7 @@ msgid ""
 "application name will be discarded."
 msgstr ""
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr ""
 
@@ -60,58 +56,18 @@ msgid ""
 "indicated by this value."
 msgstr ""
 
-#: ../src/indicator-notifications.c:177
-msgid "Notifications"
-msgstr ""
-
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
+#: ../src/service.c:221
+msgid "from"
 msgstr ""
 
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:270 ../src/service.c:299
+msgid "Notifications"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-msgid "Hide indicator"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr ""
-
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
-
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
-msgid "Maximum number of visible notifications"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr ""
-
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr ""
-
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 961be17..1e0c100 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-21 15:00+0200\n"
+"POT-Creation-Date: 2020-11-12 14:54+0100\n"
 "PO-Revision-Date: 2020-09-05 16:36+0000\n"
 "Last-Translator: tommymaple <godoffrog@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <https://hosted.weblate.org/projects/"
@@ -19,9 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 4.3-dev\n"
 
-#. filter-list
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:1
-#: ../src/indicator-notifications-settings.c:327
 msgid "Discard notifications by application name"
 msgstr "按應用程式名稱放棄通知"
 
@@ -32,9 +30,7 @@ msgid ""
 "application name will be discarded."
 msgstr "如果應用程式名稱在黑名單，則將放棄與應用程式名稱匹配的所有通知。"
 
-#. clear-on-middle-click
 #: ../data/org.ayatana.indicator.notifications.gschema.xml.in.in:3
-#: ../src/indicator-notifications-settings.c:279
 msgid "Clear notifications on middle click"
 msgstr "中間點擊清除通知"
 
@@ -65,60 +61,35 @@ msgid ""
 "indicated by this value."
 msgstr "指示器最多只顯示此值指示的通知數量。"
 
-#: ../src/indicator-notifications.c:177
+#: ../src/service.c:221
+msgid "from"
+msgstr "來自"
+
+#: ../src/service.c:270 ../src/service.c:299
 msgid "Notifications"
 msgstr "通知"
 
-#. Create the settings menuitem
-#: ../src/indicator-notifications.c:186
-msgid "Settings…"
-msgstr "設定"
-
-#: ../src/indicator-notifications.c:522
-#, c-format
-msgid "Clear <small>(%d Notification)</small>"
-msgid_plural "Clear <small>(%d Notifications)</small>"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Window Frame
-#: ../src/indicator-notifications-settings.c:262
-#: ../src/indicator-notifications-settings.c:268
-#: ../src/indicator-notifications-settings.c:411
-msgid "Indicator Notifications Settings"
+#: ../src/service.c:327
+msgid "Clear"
 msgstr ""
 
-#. hide-indicator
-#: ../src/indicator-notifications-settings.c:288
-#, fuzzy
-msgid "Hide indicator"
-msgstr "隱藏指示器"
-
-#. do-not-disturb
-#: ../src/indicator-notifications-settings.c:297
+#: ../src/service.c:338
 msgid "Do not disturb"
 msgstr "請勿打擾"
 
-#. swap-clear-settings
-#: ../src/indicator-notifications-settings.c:306
-msgid "Swap \"Clear\" and \"Settings\" items"
-msgstr ""
+#~ msgid "Settings…"
+#~ msgstr "設定"
 
-#. max-items
-#. FIXME: indicator does not change max items until restart...
-#: ../src/indicator-notifications-settings.c:316
 #, fuzzy
-msgid "Maximum number of visible notifications"
-msgstr "最大可見項目數量"
+#~ msgid "Hide indicator"
+#~ msgstr "隱藏指示器"
 
-#: ../src/indicator-notifications-settings.c:352
-msgid "Remove"
-msgstr "移除"
+#, fuzzy
+#~ msgid "Maximum number of visible notifications"
+#~ msgstr "最大可見項目數量"
 
-#: ../src/indicator-notifications-settings.c:357
-msgid "Add"
-msgstr "增加"
+#~ msgid "Remove"
+#~ msgstr "移除"
 
-#: ../src/notification-menuitem.c:128
-msgid "from"
-msgstr "來自"
+#~ msgid "Add"
+#~ msgstr "增加"
diff --git a/update-po.sh b/update-po.sh
index f0081bb..59ad5c4 100755
--- a/update-po.sh
+++ b/update-po.sh
@@ -16,7 +16,7 @@ set -x
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>
 
-GETTEXT_DOMAIN=$(cat configure.ac | grep -E "^GETTEXT_PACKAGE=" | sed -e 's/GETTEXT_PACKAGE=//')
+GETTEXT_DOMAIN=$(cat CMakeLists.txt | grep 'set.*(.*GETTEXT_PACKAGE' | sed -r -e 's/.*\"([^"]+)\"\)/\1/')
 
 cp po/${GETTEXT_DOMAIN}.pot po/${GETTEXT_DOMAIN}.pot~
author	Mike Gabriel <mike.gabriel@das-netzwerkteam.de>	2020-11-12 14:55:43 +0100
committer	Mike Gabriel <mike.gabriel@das-netzwerkteam.de>	2020-11-12 14:55:43 +0100
commit	a146339c86c592b4f4aaba69386b7772fb130abf (patch)
tree	94ec0de4970c22af0802e60b9faa5746493ff5b7
parent	9833b92f27b2639cd3a82d1abe880969d79680b7 (diff)
download	ayatana-indicator-notifications-a146339c86c592b4f4aaba69386b7772fb130abf.tar.gz ayatana-indicator-notifications-a146339c86c592b4f4aaba69386b7772fb130abf.tar.bz2 ayatana-indicator-notifications-a146339c86c592b4f4aaba69386b7772fb130abf.zip