118 files changed, 22988 insertions, 17716 deletions
diff --git a/po/af.po b/po/af.po
index ec580e3..44ed49c 100644
--- a/po/af.po
+++ b/po/af.po
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
 "PO-Revision-Date: 2010-04-11 12:52+0000\n"
 "Last-Translator: JC Brand <Unknown>\n"
 "Language-Team: Afrikaans <af@li.org>\n"
+"Language: af\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,269 +19,235 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
 msgstr ""
+"Onderdruk die opskietvenster om afmeld, herlaai en afskakel te bevestig"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
+"Om die opskietvensters vir afmeld, herlaai en afskakel te wys al dan nie."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Verwyder die afmeld item van die sessie-kieslys"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Verwyder die herlaai item vanaf die sessie-kieslys"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
 msgid "Remove the shutdown item from the session menu"
 msgstr "Verwyder die afskakel item vanaf die sessie-kieslys"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
-"Onderdruk die opskietvenster om afmeld, herlaai en afskakel te bevestig"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"Om die opskietvensters vir afmeld, herlaai en afskakel te wys al dan nie."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
+#: ../src/service.c:325
+msgid "Guest"
 msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Sluit skerm"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Skakel af"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Meld af"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Herlaai"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
+#: ../src/service.c:363
+msgid "Online Accounts…"
 msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
+#: ../src/service.c:566
+msgid "Start Screen Saver"
 msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
 msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "Meld af"
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "Herlaai"
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
-msgstr "Skakel af"
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
-msgstr "Is u seker u wil alle programme sluit en by die rekenaar afmeld?"
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
-msgstr "Is u seker u wil alle programme sluit en die rekenaar herlaai?"
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Gas sessie"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
-msgstr "Is u seker u wil alle programme sluit en die rekenaar afskakel?"
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Meld af"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Herlaai"
-
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Skakel af"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Slaap"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Meld af"
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Hiberneer"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
+#: ../src/service.c:722
 msgid "Restart…"
 msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "Herlaai"
+
+#: ../src/service.c:729
 msgid "Shut Down…"
 msgstr ""
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Herlaai eerder"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr "Skakel af"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
+msgstr "Is u seker u wil alle programme sluit en by die rekenaar afmeld?"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
 msgstr ""
+"Sekere sagteware opdaterings sal eers in werking tree nadat die rekenaar "
+"herlaai is."
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
 msgid "Cancel"
 msgstr "Kanselleer"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "1"
-
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr ""
-
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr ""
-
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr ""
-
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr ""
-
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr ""
-
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr ""
-
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr "Is u seker u wil alle programme sluit en die rekenaar herlaai?"
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr "Is u seker u wil alle programme sluit en die rekenaar afskakel?"
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr ""
+#~ msgid "Lock Screen"
+#~ msgstr "Sluit skerm"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Slaap"
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Meld af"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Hiberneer"
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Herlaai"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Gas sessie"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Skakel af"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Meld af"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Herlaai"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Skakel af"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr ""
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Meld af"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr ""
+#~ msgid "Restart Instead"
+#~ msgstr "Herlaai eerder"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr ""
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "1"
 
 #~ msgid "Shut Down..."
 #~ msgstr "Skakel af..."
@@ -295,11 +262,6 @@ msgstr ""
 #~ msgid "Shut Down..."
 #~ msgstr "Skakel af..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Sekere sagteware opdaterings sal eers in werking tree nadat die rekenaar "
-#~ "herlaai is."
-
 #~ msgid "Restart Instead..."
 #~ msgstr "Herlaai eerder..."
 
@@ -307,7 +269,6 @@ msgstr ""
 #~ msgid "Restart..."
 #~ msgstr "Herlaai..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Verander van %s..."
 
@@ -316,11 +277,14 @@ msgstr ""
 
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
 #~ msgstr ""
-#~ "Verander dit sodat die afmeld knoppie nie in die sessie-kieslys verskyn nie."
+#~ "Verander dit sodat die afmeld knoppie nie in die sessie-kieslys verskyn "
+#~ "nie."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr ""
-#~ "Verander dit sodat die herlaai knoppie nie in die sessie-kieslys verskyn nie."
+#~ "Verander dit sodat die herlaai knoppie nie in die sessie-kieslys verskyn "
+#~ "nie."
 
 #~ msgid ""
 #~ "Makes it so that the shutdown button doesn't show in the session menu."
diff --git a/po/am.po b/po/am.po
index 3085044..00ffddb 100644
--- a/po/am.po
+++ b/po/am.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
 "PO-Revision-Date: 2011-09-22 05:39+0000\n"
 "Last-Translator: samson <Unknown>\n"
 "Language-Team: Amharic <am@li.org>\n"
+"Language: am\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,267 +19,300 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr "የመውጫው ቁልፍ በክፍለ ጊዜው ዝርዝር ውስጥ እንዳይታይ ያደርገዋል"
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr "መጫን ንግግሩን ለማረጋገጥ መውጣቱን ፤ እንደገና መጀመር እና መዝጋት ተግባሩን"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr "የእንደገና ማስጀመሪያ ቁልፍ በክፍለ ጊዜው ዝርዝር ውስጥ እንዳይታይ ያደርገዋል"
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
-msgstr "የማጥፊያው ቁልፍ በክፍለ ጊዜው ዝርዝር ውስጥ እንዳይታይ ያደርገዋል"
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr "ቢሆንም ባይሆንም ማሳየት ለማረጋገጥ ንግግሩን ለመውጣት ፤  እንደገና መጀመር እና መዝጋት ተግባሩን"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "በክፍለ ጊዜው ዝርዝር ውስጥ የመውጫን ቁልፍ ማስወገጃ"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr "የመውጫው ቁልፍ በክፍለ ጊዜው ዝርዝር ውስጥ እንዳይታይ ያደርገዋል"
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "በክፍለ ጊዜው ዝርዝር ውስጥ የእንደገና ማስጀመሪያን ቁልፍ ማስወገጃ"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
-msgstr "በክፍለ ጊዜው ዝርዝር ውስጥ የማጥፊያን ቁልፍ ማስወገጃ"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr "የእንደገና ማስጀመሪያ ቁልፍ በክፍለ ጊዜው ዝርዝር ውስጥ እንዳይታይ ያደርገዋል"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
-msgstr "መጫን ንግግሩን ለማረጋገጥ መውጣቱን ፤ እንደገና መጀመር እና መዝጋት ተግባሩን"
+msgid "Remove the shutdown item from the session menu"
+msgstr "በክፍለ ጊዜው ዝርዝር ውስጥ የማጥፊያን ቁልፍ ማስወገጃ"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
-msgstr "ቢሆንም ባይሆንም ማሳየት ለማረጋገጥ ንግግሩን ለመውጣት ፤  እንደገና መጀመር እና መዝጋት ተግባሩን"
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr "የማጥፊያው ቁልፍ በክፍለ ጊዜው ዝርዝር ውስጥ እንዳይታይ ያደርገዋል"
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
+msgstr ""
+
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "አይነተኛ የእንግዳ ክፍለ ጊዜ"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "እንግዳ"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "አይነተኛ የዴስክቶፕ በመጠቀም የእንግዳ ክፍለ ጊዜ ማስጀመሪያ"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "እስክሪን መቆለፊያ"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "ማጥፊያ"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "መውጫ"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "ስርአቱን ማሰናጃ…"
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "እንደገና ማስጀመሪያ"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "የመስመር ላይ መግለጫ..."
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "መውጫ..."
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "እንደገና ማስጀመሪያ..."
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "የተጠቃሚ መግለጫ መቀየሪያ..."
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "ማጥፊያ..."
+#: ../src/service.c:575 ../src/service.c:591
+#, fuzzy
+msgid "Switch Account"
+msgstr "የተጠቃሚ መግለጫ መቀየሪያ..."
+
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "የተጠቃሚ መግለጫ መቀየሪያ..."
+
+#: ../src/service.c:588
+#, fuzzy
+msgid "Lock/Switch Account"
+msgstr "የተጠቃሚ መግለጫ መቀየሪያ..."
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "የእንግዳ ክፍለጊዜ"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "መውጫ..."
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "መውጫ"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "ማገጃ"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "ማስተኛ"
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr "እንደገና ማስጀመሪያ..."
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
 msgid "Restart"
 msgstr "እንደገና ማስጀመሪያ"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr "ማጥፊያ..."
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
 msgstr "ማጥፊያ"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr "በእርግጥ ሁሉንም ፕሮግራሞች ዘግተው ከኮምፒዩተሩ መውጣት ይፈልጋሉ?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr "የአንዳንድ ሶፍትዌሮች ማሻሻያ ኮምፒዩተሩ እንደገና እስካልተነሳ ተፈጻሚ አይሆኑም"
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "መሰረዣ"
+
+#: ../src/backend-dbus/actions.c:862
 msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr "በእርግጥ ሁሉንም ፕሮግራሞች ዘግተው ኮምፒዩተሩን እንደገና ማስነሳት ይፈልጋሉ?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr "በእርግጥ ሁሉንም ፕሮግራሞች ዘግተው ኮምፒዩተሩን ማጥፋት ይፈልጋሉ?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "መውጫ"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "እንደገና ማስጀመሪያ"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "ማጥፊያ"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "መውጫ"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr "እንደገና ማስጀመሪያ..."
+#~ msgid "Classic Guest Session"
+#~ msgstr "አይነተኛ የእንግዳ ክፍለ ጊዜ"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr "ማጥፊያ..."
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "አይነተኛ የዴስክቶፕ በመጠቀም የእንግዳ ክፍለ ጊዜ ማስጀመሪያ"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "በምትኩ እንደገና ላስጀምር"
+#~ msgid "Lock Screen"
+#~ msgstr "እስክሪን መቆለፊያ"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "በምትኩ እንደገና ማስጀመሪያ..."
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "መውጫ"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr "የአንዳንድ ሶፍትዌሮች ማሻሻያ ኮምፒዩተሩ ጠፍቶ ካልበራ ተግባራዊ አይሆንም"
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "እንደገና ማስጀመሪያ"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "መሰረዣ"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "ማጥፊያ"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "1"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "መውጫ"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr "የተጠቃሚ መግለጫ መቀየሪያ..."
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "እንደገና ማስጀመሪያ"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "መቀየሪያ ከ %s…"
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "ማጥፊያ"
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "ሶፍትዌሩ ዘመናዊ ነው"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "መውጫ"
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "ዝግጁ ማሻሻያ…"
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "እንደገና ማስጀመሪያ..."
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "ማሻሻያውን በመግጠም ላይ…"
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "ማጥፊያ..."
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr "እንደገና ያስጀምሩ ማሻሻያውን ለመፈጸም..."
+#~ msgid "Restart Instead"
+#~ msgstr "በምትኩ እንደገና ላስጀምር"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "ስርአቱን ማሰናጃ…"
+#~ msgid "Restart Instead…"
+#~ msgstr "በምትኩ እንደገና ማስጀመሪያ..."
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "ማሳያዎች…"
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr "የአንዳንድ ሶፍትዌሮች ማሻሻያ ኮምፒዩተሩ ጠፍቶ ካልበራ ተግባራዊ አይሆንም"
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "መተግበሪያዎች ማስጀመሪያ…"
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "1"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "የተያያዙ አካሎች"
+#~ msgid "Switch From %s…"
+#~ msgstr "መቀየሪያ ከ %s…"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "ማተሚያዎች"
+#~ msgid "Software Up to Date"
+#~ msgstr "ሶፍትዌሩ ዘመናዊ ነው"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "ማሰሻዎች"
+#~ msgid "Updates Available…"
+#~ msgstr "ዝግጁ ማሻሻያ…"
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "የዌብ ካሜራ"
+#~ msgid "Updates Installing…"
+#~ msgstr "ማሻሻያውን በመግጠም ላይ…"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "ማገጃ"
+#~ msgid "Restart to Complete Updates…"
+#~ msgstr "እንደገና ያስጀምሩ ማሻሻያውን ለመፈጸም..."
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "ማስተኛ"
+#~ msgid "Displays…"
+#~ msgstr "ማሳያዎች…"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "የእንግዳ ክፍለጊዜ"
+#~ msgid "Startup Applications…"
+#~ msgstr "መተግበሪያዎች ማስጀመሪያ…"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "እንግዳ"
+#~ msgid "Attached Devices"
+#~ msgstr "የተያያዙ አካሎች"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "የመስመር ላይ መግለጫ..."
+#~ msgid "Printers"
+#~ msgstr "ማተሚያዎች"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "የተጠቃሚ መግለጫ..."
+#~ msgid "Scanners"
+#~ msgstr "ማሰሻዎች"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "%s የዌብ ካሜራ"
+#~ msgid "Webcam"
+#~ msgstr "የዌብ ካሜራ"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "ማሰሻ"
+#~ msgid "User Accounts…"
+#~ msgstr "የተጠቃሚ መግለጫ..."
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "%s ማሰሻ"
+#~ msgid "%s Webcam"
+#~ msgstr "%s የዌብ ካሜራ"
+
+#~ msgid "Scanner"
+#~ msgstr "ማሰሻ"
+
+#~ msgid "%s Scanner"
+#~ msgstr "%s ማሰሻ"
 
 #~ msgid "Restart..."
 #~ msgstr "እንደገና ማስጀመር..."
@@ -292,7 +326,6 @@ msgstr "%s ማሰሻ"
 #~ msgid "Switch User..."
 #~ msgstr "ተጠቃሚ መቀየር..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "መቀየር ከ %s..."
 
@@ -310,7 +343,8 @@ msgstr "%s ማሰሻ"
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
 #~ msgstr "በክፍለ ጊዜው ዝርዝር ውስጥ የመውጫ ቁልፍ እንዳይታይ ያደርገዋል"
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "በክፍለ ጊዜው ዝርዝር ውስጥ የእንደገና ማስጀመሪያ ቁልፍ እንዳይታይ ያደርገዋል"
 
 #~ msgid ""
@@ -323,8 +357,5 @@ msgstr "%s ማሰሻ"
 #~ msgid "Restart to Complete Update"
 #~ msgstr "ማሻሻያው እንዲፈጸም እንደገና ማስነሻ"
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr "የአንዳንድ ሶፍትዌሮች ማሻሻያ ኮምፒዩተሩ እንደገና እስካልተነሳ ተፈጻሚ አይሆኑም"
-
 #~ msgid "Restart Instead..."
 #~ msgstr "በምትኩ እንደገና ላስጀምር..."
diff --git a/po/an.po b/po/an.po
index 94588fb..db4c0e5 100644
--- a/po/an.po
+++ b/po/an.po
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
 "PO-Revision-Date: 2011-09-24 16:03+0000\n"
 "Last-Translator: Daniel Martinez <entaltoaragon@gmail.com>\n"
 "Language-Team: Aragonese <an@li.org>\n"
+"Language: an\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,274 +19,262 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
 msgstr ""
+"Borra lo dialogo ta confirmar l'accion de trancar sesion, reiniciar y "
+"amortar."
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
+"Tria si s'amostran u no dialogos de confirmacion ta desenchegar-se, "
+"reiniciar u trancar sesion."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Borra la opción «Trancar» sesión d'o menú de sesión"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Borra la opción «Reiniciar» d'o menú de sesión"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
-msgstr "Borra la opción «Amortar» d'o menú de sesión"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
-msgstr ""
-"Borra lo dialogo ta confirmar l'accion de trancar sesion, reiniciar y "
-"amortar."
+msgid "Remove the shutdown item from the session menu"
+msgstr "Borra la opción «Amortar» d'o menú de sesión"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
-"Tria si s'amostran u no dialogos de confirmacion ta desenchegar-se, "
-"reiniciar u trancar sesion."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Bloqueyar a pantalla"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "Convidau"
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Amortar"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Trancar sesión"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Reiniciar"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Trancar sesion…"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "Configuracion d'o sistema…"
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Reiniciar…"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Amortar…"
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "Trancar sesión"
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "Cuentas d'usuario…"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "Reiniciar"
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
-msgstr "Amortar"
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
 msgstr ""
-"¿De seguras que quiere trancar totz os programas y rematar a suya sesion en "
-"l'equipo?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
+#: ../src/service.c:594
+msgid "Lock"
 msgstr ""
-"¿De seguras que quiere trancar totz os programas y reiniciar l'equipo?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
-msgstr "¿De seguras que quiere trancar totz os programas y amortar l'equipo?"
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Sesión de convidau"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Trancar sesion…"
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Trancar sesión"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Reiniciar"
-
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Amortar"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Suspender"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Trancar sesión"
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Hibernar"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
+#: ../src/service.c:722
 msgid "Restart…"
 msgstr "Reiniciar…"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "Reiniciar"
+
+#: ../src/service.c:729
 msgid "Shut Down…"
 msgstr "Amortar…"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Millor reiniciar"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr "Amortar"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "Millor reiniciar…"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
+msgstr ""
+"¿De seguras que quiere trancar totz os programas y rematar a suya sesion en "
+"l'equipo?"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
 msgstr ""
+"Bels esvielles de software no s'aplicaran dica que no se reinicie l'equipo."
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "0"
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr "¿De seguras que quiere trancar totz os programas y reiniciar l'equipo?"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr "¿De seguras que quiere trancar totz os programas y amortar l'equipo?"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "Software esviellau"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr "Reiniciar ta rematar os esvielles…"
+#~ msgid "Lock Screen"
+#~ msgstr "Bloqueyar a pantalla"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "Configuracion d'o sistema…"
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Trancar sesión"
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "Pantallas…"
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Reiniciar"
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Amortar"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "Dispositivos enchegaus"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Trancar sesión"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Reiniciar"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Amortar"
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr ""
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Trancar sesión"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Suspender"
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "Reiniciar…"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Hibernar"
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "Amortar…"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Sesión de convidau"
+#~ msgid "Restart Instead"
+#~ msgstr "Millor reiniciar"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "Convidau"
+#~ msgid "Restart Instead…"
+#~ msgstr "Millor reiniciar…"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr ""
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "0"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "Cuentas d'usuario…"
+#~ msgid "Software Up to Date"
+#~ msgstr "Software esviellau"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr ""
+#~ msgid "Restart to Complete Updates…"
+#~ msgstr "Reiniciar ta rematar os esvielles…"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr ""
+#~ msgid "Displays…"
+#~ msgstr "Pantallas…"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr ""
+#~ msgid "Attached Devices"
+#~ msgstr "Dispositivos enchegaus"
 
 #~ msgid "Restart..."
 #~ msgstr "Reiniciar..."
@@ -313,14 +302,14 @@ msgstr ""
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
 #~ msgstr "Fa que lo boton de trancar sesion no s'amostre en o menu de sesion."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "Fa que lo boton de reinicio no s'amostre en lo menu de sesion."
 
 #~ msgid ""
 #~ "Makes it so that the shutdown button doesn't show in the session menu."
 #~ msgstr "Fa que lo boton d'amortar no s'amostre en o menu de sesion."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Cambear dende %s..."
 
@@ -330,9 +319,5 @@ msgstr ""
 #~ msgid "Restart to Complete Update"
 #~ msgstr "Reiniciar ta rematar l'esvielle"
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Bels esvielles de software no s'aplicaran dica que no se reinicie l'equipo."
-
 #~ msgid "Session"
 #~ msgstr "Sesión"
diff --git a/po/ar.po b/po/ar.po
index 453e403..fabba76 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
 "PO-Revision-Date: 2011-09-15 09:58+0000\n"
 "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
 "Language-Team: Arabic\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,267 +19,231 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr ""
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr "أخفِ حوار تأكيد الخروج وإعادة التشغيل والإيقاف"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
-msgstr ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr "ما إذا ستظهر حوارات تأكيد الخروج وإعادة التشغيل والإيقاف ."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "أزل عنصر الخروج من قائمة الجلسة"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "أزل عنصر إعادة التشغيل من قائمة الجلسة"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
-msgstr "أزل عنصر الإطفاء من قائمة الجلسة"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
-msgstr "أخفِ حوار تأكيد الخروج وإعادة التشغيل والإيقاف"
+msgid "Remove the shutdown item from the session menu"
+msgstr "أزل عنصر الإطفاء من قائمة الجلسة"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
-msgstr "ما إذا ستظهر حوارات تأكيد الخروج وإعادة التشغيل والإيقاف ."
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "أوصِد الشاشة"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "أطفئ"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "اخرج"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "أعِد التشغيل"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "اخرج..."
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "أعد التشغيل..."
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "أطفئ..."
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "اخرج"
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "أعِد التشغيل"
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
-msgstr "أطفئ"
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
-msgstr "أمتأكد أنك ترغب في إغلاق كل البرامج والخروج من الحاسوب؟"
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
-msgstr "أمتأكد أنك ترغب في إغلاق كل البرامج وإعادة تشغيل الحاسوب؟"
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
-msgstr "أمتأكد أنك ترغب في إغلاق كل البرامج وإطفاء الحاسوب؟"
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "جلسة ضيف"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "اخرج..."
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "اخرج"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "أعِد التشغيل"
-
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "أطفئ"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "علّق"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "اخرج"
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "أسبِت"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
+#: ../src/service.c:722
 msgid "Restart…"
-msgstr ""
+msgstr "أعد التشغيل..."
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "أعِد التشغيل"
+
+#: ../src/service.c:729
 msgid "Shut Down…"
-msgstr ""
+msgstr "أطفئ..."
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "أعِد التشغيل"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr "أطفئ"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
+msgstr "أمتأكد أنك ترغب في إغلاق كل البرامج والخروج من الحاسوب؟"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr "بعض تحديثات البرمجيات لن تصبح فاعلة إلا بعد تشغيل الحاسوب."
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
 msgid "Cancel"
 msgstr "ألغِ"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "0"
-
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr ""
-
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr ""
-
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr ""
-
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr ""
-
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr ""
-
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr ""
-
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr "أمتأكد أنك ترغب في إغلاق كل البرامج وإعادة تشغيل الحاسوب؟"
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr "أمتأكد أنك ترغب في إغلاق كل البرامج وإطفاء الحاسوب؟"
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr ""
+#~ msgid "Lock Screen"
+#~ msgstr "أوصِد الشاشة"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "علّق"
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "اخرج"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "أسبِت"
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "أعِد التشغيل"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "جلسة ضيف"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "أطفئ"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "اخرج"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "أعِد التشغيل"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "أطفئ"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr ""
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "اخرج"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr ""
+#~ msgid "Restart Instead"
+#~ msgstr "أعِد التشغيل"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr ""
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "0"
 
 #~ msgid "Restart..."
 #~ msgstr "أعِد التشغيل..."
@@ -296,13 +261,9 @@ msgstr ""
 #~ msgid "Restart..."
 #~ msgstr "أعِد التشغيل..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr "بعض تحديثات البرمجيات لن تصبح فاعلة إلا بعد تشغيل الحاسوب."
-
 #~ msgid "Restart Instead..."
 #~ msgstr "أعِد التشغيل..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "تحوّل من %s..."
 
@@ -313,7 +274,8 @@ msgstr ""
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
 #~ msgstr "يجعل زر الخروج لا يظهر في قائمة الجلسة."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "يجعل زر إعادة التشغيل لا يظهر في قائمة الجلسة."
 
 #~ msgid ""
diff --git a/po/ast.po b/po/ast.po
index 1143aa6..67bfcc6 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
 "PO-Revision-Date: 2011-09-17 15:24+0000\n"
 "Last-Translator: Iñigo Varela <malditoastur@gmail.com>\n"
 "Language-Team: Asturian <ast@li.org>\n"
+"Language: ast\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,273 +19,308 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr "Fai que'l botón de zarrar nun apaeza nel menú de sesión."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+"Suprimir la ventana de confirmación al zarrar sesión, reaniciar y apagar."
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr "Fai que'l botón de reaniciar nun apaeza nel menú de sesión."
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
-msgstr "Fai que'l botón d'apagar nun apaeza nel menú de sesión."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+"Si amosar o non los diálogos de confirmación pa zarrar sesión, reaniciar y "
+"apagar."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Quitar la opción Zarrar sesión del menú de sesión"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr "Fai que'l botón de zarrar nun apaeza nel menú de sesión."
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Desanicia la opción «Reaniciar» del menú de sesión"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr "Fai que'l botón de reaniciar nun apaeza nel menú de sesión."
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
 msgid "Remove the shutdown item from the session menu"
 msgstr "Desanicia la opción «Apagar» del menú de sesión"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr "Fai que'l botón d'apagar nun apaeza nel menú de sesión."
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"Suprimir la ventana de confirmación al zarrar sesión, reaniciar y apagar."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
-"Si amosar o non los diálogos de confirmación pa zarrar sesión, reaniciar y "
-"apagar."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "Sesión d'invitáu clásica"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "Invitáu"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "Aniciar una sesión d'invitáu usando l'escritoriu clásicu"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Candar pantalla"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Apagar"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Zarrar sesión"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "Configuración del sistema..."
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Reaniciar"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "Cuentes en llinia..."
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Zarrar sesión..."
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Reaniciar..."
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "Camudar cuenta d'usuariu..."
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Apagar..."
+#: ../src/service.c:575 ../src/service.c:591
+#, fuzzy
+msgid "Switch Account"
+msgstr "Camudar cuenta d'usuariu..."
+
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "Camudar cuenta d'usuariu..."
+
+#: ../src/service.c:588
+#, fuzzy
+msgid "Lock/Switch Account"
+msgstr "Camudar cuenta d'usuariu..."
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Sesión d'invitáu"
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Zarrar sesión..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Zarrar sesión"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Suspender"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Ivernar"
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr "Reaniciar..."
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
 msgid "Restart"
 msgstr "Reaniciar"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr "Apagar..."
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
 msgstr "Apagar"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr ""
 "¿Daveres que quies zarrar tolos programes y finar la sesión nel equipu?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+"Dalgunos anovamientos de software nun van aplicase hasta que se reanicie "
+"l'equipu."
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "Encaboxar"
+
+#: ../src/backend-dbus/actions.c:862
 msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr "¿Daveres que quies zarrar tolos programes y reaniciar l'equipu?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr "¿Daveres que quies zarrar tolos programes y apagar l'equipu?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "Zarrar sesión"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Reaniciar"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Apagar"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Zarrar sesión"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr "Reaniciar..."
+#~ msgid "Classic Guest Session"
+#~ msgstr "Sesión d'invitáu clásica"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr "Apagar..."
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "Aniciar una sesión d'invitáu usando l'escritoriu clásicu"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Meyor reaniciar"
+#~ msgid "Lock Screen"
+#~ msgstr "Candar pantalla"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "Meyor reiniciar…"
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Zarrar sesión"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
-"Nun van aplicase dalgunos anovamientos de software hasta que se reanicie "
-"l'equipu."
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Reaniciar"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "Encaboxar"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Apagar"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "0"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Zarrar sesión"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr "Camudar cuenta d'usuariu..."
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Reaniciar"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "Camudar dende %s…"
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Apagar"
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "Software anováu"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Zarrar sesión"
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "Anovamientos disponibles..."
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "Reaniciar..."
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "Anovamientos instalándose..."
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "Apagar..."
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr "Reaniciar pa completar los anovamientos…"
+#~ msgid "Restart Instead"
+#~ msgstr "Meyor reaniciar"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "Configuración del sistema..."
+#~ msgid "Restart Instead…"
+#~ msgstr "Meyor reiniciar…"
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "Pantalles..."
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr ""
+#~ "Nun van aplicase dalgunos anovamientos de software hasta que se reanicie "
+#~ "l'equipu."
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "Aplicaciones nel aniciu..."
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "0"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "Preseos coneutaos"
+#~ msgid "Switch From %s…"
+#~ msgstr "Camudar dende %s…"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "Imprentadores"
+#~ msgid "Software Up to Date"
+#~ msgstr "Software anováu"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "Escáneres"
+#~ msgid "Updates Available…"
+#~ msgstr "Anovamientos disponibles..."
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "Cámara web"
+#~ msgid "Updates Installing…"
+#~ msgstr "Anovamientos instalándose..."
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Suspender"
+#~ msgid "Restart to Complete Updates…"
+#~ msgstr "Reaniciar pa completar los anovamientos…"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Ivernar"
+#~ msgid "Displays…"
+#~ msgstr "Pantalles..."
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Sesión d'invitáu"
+#~ msgid "Startup Applications…"
+#~ msgstr "Aplicaciones nel aniciu..."
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "Invitáu"
+#~ msgid "Attached Devices"
+#~ msgstr "Preseos coneutaos"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "Cuentes en llinia..."
+#~ msgid "Printers"
+#~ msgstr "Imprentadores"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "Cuentes d'usuariu…"
+#~ msgid "Scanners"
+#~ msgstr "Escáneres"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "Cámara web %s"
+#~ msgid "Webcam"
+#~ msgstr "Cámara web"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "Escáner"
+#~ msgid "User Accounts…"
+#~ msgstr "Cuentes d'usuariu…"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "Escáner %s"
+#~ msgid "%s Webcam"
+#~ msgstr "Cámara web %s"
+
+#~ msgid "Scanner"
+#~ msgstr "Escáner"
+
+#~ msgid "%s Scanner"
+#~ msgstr "Escáner %s"
 
 #~ msgid "Restart..."
 #~ msgstr "Reaniciar..."
@@ -302,15 +338,9 @@ msgstr "Escáner %s"
 #~ msgid "Restart..."
 #~ msgstr "Reaniciar..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Dalgunos anovamientos de software nun van aplicase hasta que se reanicie "
-#~ "l'equipu."
-
 #~ msgid "Restart Instead..."
 #~ msgstr "Meyor reaniciar..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Camudar de %s..."
 
@@ -321,7 +351,8 @@ msgstr "Escáner %s"
 #~ msgid "Shut Down..."
 #~ msgstr "Apagar..."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "Fai que'l botón de reaniciu nun s'amuese nel menú de sesión."
 
 #~ msgid ""
diff --git a/po/ayatana-indicator-session.pot b/po/ayatana-indicator-session.pot
index 9a75f45..ca1cb62 100644
--- a/po/ayatana-indicator-session.pot
+++ b/po/ayatana-indicator-session.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-21 15:36+0200\n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/az.po b/po/az.po
index 8215595..4ab6d5d 100644
--- a/po/az.po
+++ b/po/az.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
 "PO-Revision-Date: 2011-09-15 09:57+0000\n"
 "Last-Translator: Elxan İsmayılov <elxan.i@gmail.com>\n"
 "Language-Team: Azerbaijani <az@li.org>\n"
+"Language: az\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,274 +19,239 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr ""
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr "İclası bağlama, yenidən başlatma və sistemi söndürmə dialoqunu gizlət"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
+"İclas bağlama, yenidən başladma və sistem söndürmə zamanı təsdiq "
+"dialoqlarının göstərilib göstərilməməsi"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "İclas menyusundan İclasdan Çıxış düyməsini sil"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "İclas menyusundan Yenidən Başlad düyməsini sil"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
-msgstr "İclas menyusundan Sistemi Söndür düyməsini sil"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
-msgstr ""
-"İclası bağlama, yenidən başlatma və sistemi söndürmə dialoqunu gizlət"
+msgid "Remove the shutdown item from the session menu"
+msgstr "İclas menyusundan Sistemi Söndür düyməsini sil"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
-"İclas bağlama, yenidən başladma və sistem söndürmə zamanı təsdiq "
-"dialoqlarının göstərilib göstərilməməsi"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Ekranı Qıfılla"
-
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Sistemi Söndür"
-
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "İclası Bağla"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Yenidən başlat"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "İclası Bağla..."
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Yenidən Başlad..."
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Sistemi Söndür..."
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "İclası Bağla"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "Yenidən başlat"
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
-msgstr "Sistemi Söndür"
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
 msgstr ""
-"Siz əminsiniz ki bütün proqramları bağlayıb iclası bitirmənizi istəyirsiz?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
 msgstr ""
-"Siz əminsiniz ki bütün proqramları bağlayıb kompyuteri yenidən başlamasını "
-"istəyirsiz?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
 msgstr ""
-"Siz əminsiniz ki bütün proqramları bağlayıb sistemi söndürmək istəyirsiz?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "İclası Bağla"
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Yenidən başlat"
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Qonaq İclası"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Sistemi Söndür"
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "İclası Bağla..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "İclası Bağla"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Gözlət"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Mürgülə"
+
+#: ../src/service.c:722
 msgid "Restart…"
-msgstr ""
+msgstr "Yenidən Başlad..."
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "Yenidən başlat"
+
+#: ../src/service.c:729
 msgid "Shut Down…"
-msgstr ""
+msgstr "Sistemi Söndür..."
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Əvəzinə Yenidən Başlad"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr "Sistemi Söndür"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr ""
+"Siz əminsiniz ki bütün proqramları bağlayıb iclası bitirmənizi istəyirsiz?"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
 msgstr ""
+"Bəzi proqram yenilənmələri kompyuter yenidən başlamadan tətbiq "
+"olunmayacaqlar."
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
 msgid "Cancel"
 msgstr "Ləğv et"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "0"
-
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr ""
-
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr ""
-
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr ""
-
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
+"Siz əminsiniz ki bütün proqramları bağlayıb kompyuteri yenidən başlamasını "
+"istəyirsiz?"
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
+"Siz əminsiniz ki bütün proqramları bağlayıb sistemi söndürmək istəyirsiz?"
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr ""
+#~ msgid "Lock Screen"
+#~ msgstr "Ekranı Qıfılla"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "İclası Bağla"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Yenidən başlat"
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Sistemi Söndür"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Gözlət"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "İclası Bağla"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Mürgülə"
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Yenidən başlat"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Qonaq İclası"
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Sistemi Söndür"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr ""
-
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr ""
-
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr ""
-
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr ""
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "İclası Bağla"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr ""
+#~ msgid "Restart Instead"
+#~ msgstr "Əvəzinə Yenidən Başlad"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr ""
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "0"
 
 #~ msgid "Restart..."
 #~ msgstr "Yenidən Başlat..."
@@ -306,7 +272,8 @@ msgstr ""
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
 #~ msgstr "Elə edir ki, iclasdan çıxış düyməsi iclas menyusunda göstərilmir."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "Elə edir ki, yenidən başlad düyməsi iclas menyusunda göstərilmir."
 
 #~ msgid ""
@@ -320,11 +287,6 @@ msgstr ""
 #~ msgid "Shut Down..."
 #~ msgstr "Sistemi Söndür..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Bəzi proqram yenilənmələri kompyuter yenidən başlamadan tətbiq "
-#~ "olunmayacaqlar."
-
 #~ msgid "Restart Instead..."
 #~ msgstr "Əvəzinə Yenidən Başlad..."
 
@@ -334,6 +296,5 @@ msgstr ""
 #~ msgid "Restart to Complete Update"
 #~ msgstr "Yenilənməni bitirmək üçün Yenidən Başlad"
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "%s İstifadəçini Dəyişdir..."
diff --git a/po/be.po b/po/be.po
index 42ebc8e..d68541e 100644
--- a/po/be.po
+++ b/po/be.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
 "PO-Revision-Date: 2011-03-30 23:57+0000\n"
 "Last-Translator: Alex Nyakhaychyk <nyakhaychyk@gmail.com>\n"
 "Language-Team: Belarusian <be@li.org>\n"
+"Language: be\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,270 +19,235 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
 msgstr ""
+"Прабраць дыялог падцьверджаньня выхаду, рэстарту ці выключэньня сыстэмы"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
+"Ці паказваць дыялогш падцьверджаньня выхаду, рэстарту ці выключэньня сыстэмы"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Выдаліць элемэнт «Выйсьці» з мэню сэансу."
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Выдаліць пункт Перазагрузіць з меню сесіі"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
-msgstr "Выдаліць пункт Выключыць з меню сесіі"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
-msgstr ""
-"Прабраць дыялог падцьверджаньня выхаду, рэстарту ці выключэньня сыстэмы"
+msgid "Remove the shutdown item from the session menu"
+msgstr "Выдаліць пункт Выключыць з меню сесіі"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
-"Ці паказваць дыялогш падцьверджаньня выхаду, рэстарту ці выключэньня сыстэмы"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Замкнуць экран"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Выключыць"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Завяршыць сэанс"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Перазапусьціць"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Завяршэнне сэсіі..."
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Перазагрука..."
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Выключэнне..."
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "Завяршыць сэанс"
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "Перазапусьціць"
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
-msgstr "Выключыць"
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
-msgstr "Вы ўпэўненыя што жадаеце зачыніць усе праграмы і выйсьці?"
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
+#: ../src/service.c:594
+msgid "Lock"
 msgstr ""
-"Вы ўпэўненыя што жадаеце зачыніць усе праграмы і перазапусьціць кампутар?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
-msgstr "Вы ўпэўненыя што жадаеце зачыніць усе праграмы і выключыць кампутар?"
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Гасьцявая сэсія"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Завяршэнне сэсіі..."
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Завяршыць сэанс"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Перазапусьціць"
-
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Выключыць"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Прыпыніць"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Выйсьці"
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Усыпіць"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
+#: ../src/service.c:722
 msgid "Restart…"
-msgstr ""
+msgstr "Перазагрука..."
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "Перазапусьціць"
+
+#: ../src/service.c:729
 msgid "Shut Down…"
-msgstr ""
+msgstr "Выключэнне..."
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Перазапусьціць"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr "Выключыць"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
+msgstr "Вы ўпэўненыя што жадаеце зачыніць усе праграмы і выйсьці?"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
 msgstr ""
+"Некаторыя абнаўленьні ня будуць ужытыя пакуль Вы не перазапусьціце кампутар."
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
 msgid "Cancel"
 msgstr "Скасаваць"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "1"
-
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr ""
-
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr ""
-
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr ""
-
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
+"Вы ўпэўненыя што жадаеце зачыніць усе праграмы і перазапусьціць кампутар?"
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr "Вы ўпэўненыя што жадаеце зачыніць усе праграмы і выключыць кампутар?"
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr ""
+#~ msgid "Lock Screen"
+#~ msgstr "Замкнуць экран"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Завяршыць сэанс"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Перазапусьціць"
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Выключыць"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Прыпыніць"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Завяршыць сэанс"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Усыпіць"
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Перазапусьціць"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Гасьцявая сэсія"
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Выключыць"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr ""
-
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr ""
-
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr ""
-
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr ""
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Выйсьці"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr ""
+#~ msgid "Restart Instead"
+#~ msgstr "Перазапусьціць"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr ""
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "1"
 
 #~ msgid "Restart..."
 #~ msgstr "Перазапусьціць..."
@@ -295,7 +261,6 @@ msgstr ""
 #~ msgid "Switch User..."
 #~ msgstr "Пераключыць карыстальніка"
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Пераключыцца з %s..."
 
@@ -310,10 +275,6 @@ msgstr ""
 #~ msgid "Shut Down..."
 #~ msgstr "Выключыць…"
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Некаторыя абнаўленьні ня будуць ужытыя пакуль Вы не перазапусьціце кампутар."
-
 #~ msgid "Restart Instead..."
 #~ msgstr "Перазапусьціць..."
 
@@ -326,7 +287,8 @@ msgstr ""
 #~ msgid "Session"
 #~ msgstr "Сесія"
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "Зрабіць каб кнопка перазагрузкі не адлюстроўвалась ў меню сесіі."
 
 #~ msgid ""
diff --git a/po/bem.po b/po/bem.po
new file mode 100644
index 0000000..d7a5086
--- /dev/null
+++ b/po/bem.po
@@ -0,0 +1,204 @@
+# Bemba translations for PACKAGE package.
+# Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
+"PO-Revision-Date: 2017-07-21 15:41+0200\n"
+"Last-Translator: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n"
+"Language-Team: Bemba\n"
+"Language: bem\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
+msgid ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
+msgid "Remove the Log Out item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
+msgid "Remove the Restart item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
+msgid "Remove the shutdown item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr ""
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
+msgstr ""
+
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
+
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
+
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
+
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
+
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
+
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
+
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
+
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
+
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
+
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
+
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
+
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
+msgstr ""
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr ""
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr ""
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
+msgid "Log Out"
+msgstr ""
+
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr ""
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr ""
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr ""
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr ""
+
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr ""
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:818
+msgid "Are you sure you want to close all programs and log out?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:819
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
diff --git a/po/bg.po b/po/bg.po
index ce0745c..2ccf35f 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
 "PO-Revision-Date: 2011-09-16 07:33+0000\n"
 "Last-Translator: Svetoslav Stefanov <svetlisashkov@yahoo.com>\n"
 "Language-Team: Bulgarian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,279 +19,313 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr "Прави бутонът за излизане да не се показва в менюто."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+"Да не се показва диалог за потвърждение при излизане, рестартиране и "
+"изключване"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr "Прави бутонът за рестартиране да не се показва в менюто."
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
-msgstr "Прави бутонът за изключване да не се показва в менюто."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+"Дали да се показва или не диалог за потвърждение при излизане, рестартиране "
+"и изключване"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Премахване реда за излизане от системата"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr "Прави бутонът за излизане да не се показва в менюто."
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Премахване реда за рестартиране от менюто"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr "Прави бутонът за рестартиране да не се показва в менюто."
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
 msgid "Remove the shutdown item from the session menu"
 msgstr "Премахване реда за изключване от менюто"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr "Прави бутонът за изключване да не се показва в менюто."
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"Да не се показва диалог за потвърждение при излизане, рестартиране и "
-"изключване"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
-"Дали да се показва или не диалог за потвърждение при излизане, рестартиране "
-"и изключване"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "Класическа Гост Сесия"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "Гост"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "Стартирай Гост сесия използвайки класически работен плот"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Заключване на екрана"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Изключване"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Излизане"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "Системни настройки..."
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Рестартиране"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "Онлайн регистрации..."
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Излизане"
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Рестартиране..."
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "Превключване на потребител..."
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Изключване..."
+#: ../src/service.c:575 ../src/service.c:591
+#, fuzzy
+msgid "Switch Account"
+msgstr "Превключване на потребител..."
+
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "Превключване на потребител..."
+
+#: ../src/service.c:588
+#, fuzzy
+msgid "Lock/Switch Account"
+msgstr "Превключване на потребител..."
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Гост"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Излизане"
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Излизане"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Приспиване"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Дълбоко заспиване"
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr "Рестартиране..."
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
 msgid "Restart"
 msgstr "Рестартиране"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr "Изключване..."
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
 msgstr "Изключване"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr ""
 "Сигурни ли сте, че искате да се затворят всички програми и да излезете от "
 "акаунта си?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+"Някои актуализации няма да имат ефект докато не рестартирате компютъра."
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "Отказване"
+
+#: ../src/backend-dbus/actions.c:862
 msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
 "Сигурни ли сте, че искате да се затворят всички програми и компютъра да се "
 "рестартира?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
 "Сигурни ли сте, че искате да се затворят всички програми и компютъра да се "
 "изключи?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "Излизане"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Рестартиране"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Изключване"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Излизане"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr "Рестартиране..."
+#~ msgid "Classic Guest Session"
+#~ msgstr "Класическа Гост Сесия"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr "Изключване..."
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "Стартирай Гост сесия използвайки класически работен плот"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Рестартиране вместо това"
+#~ msgid "Lock Screen"
+#~ msgstr "Заключване на екрана"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "Рестартиране вместо това..."
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Излизане"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
-"Някои софтуерни обновления няма да бъдат приложени докато компютърът не бъде "
-"рестартиран."
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Рестартиране"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "Отказване"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Изключване"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "Превключване в сесия на друг потребител"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Излизане"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr "Превключване на потребител..."
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Рестартиране"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "Превключване от %s…"
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Изключване"
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "Софтуера е актуализиран"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Излизане"
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "Възможни актуализации"
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "Рестартиране..."
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "Актуализациите се инсталират..."
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "Изключване..."
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr "Рестартиране за завършване на обновяването..."
+#~ msgid "Restart Instead"
+#~ msgstr "Рестартиране вместо това"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "Системни настройки..."
+#~ msgid "Restart Instead…"
+#~ msgstr "Рестартиране вместо това..."
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "Екрани..."
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr ""
+#~ "Някои софтуерни обновления няма да бъдат приложени докато компютърът не "
+#~ "бъде рестартиран."
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "Зареждани програми..."
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "Превключване в сесия на друг потребител"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "Закачени устройства"
+#~ msgid "Switch From %s…"
+#~ msgstr "Превключване от %s…"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "Принтери"
+#~ msgid "Software Up to Date"
+#~ msgstr "Софтуера е актуализиран"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "Скенери"
+#~ msgid "Updates Available…"
+#~ msgstr "Възможни актуализации"
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "Уеб камера"
+#~ msgid "Updates Installing…"
+#~ msgstr "Актуализациите се инсталират..."
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Приспиване"
+#~ msgid "Restart to Complete Updates…"
+#~ msgstr "Рестартиране за завършване на обновяването..."
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Дълбоко заспиване"
+#~ msgid "Displays…"
+#~ msgstr "Екрани..."
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Гост"
+#~ msgid "Startup Applications…"
+#~ msgstr "Зареждани програми..."
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "Гост"
+#~ msgid "Attached Devices"
+#~ msgstr "Закачени устройства"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "Онлайн регистрации..."
+#~ msgid "Printers"
+#~ msgstr "Принтери"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "Потребители..."
+#~ msgid "Scanners"
+#~ msgstr "Скенери"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "%s уеб камера"
+#~ msgid "Webcam"
+#~ msgstr "Уеб камера"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "Скенер"
+#~ msgid "User Accounts…"
+#~ msgstr "Потребители..."
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "%s скенер"
+#~ msgid "%s Webcam"
+#~ msgstr "%s уеб камера"
+
+#~ msgid "Scanner"
+#~ msgstr "Скенер"
+
+#~ msgid "%s Scanner"
+#~ msgstr "%s скенер"
 
 #~ msgid "Log Out..."
 #~ msgstr "Излизане..."
@@ -305,17 +340,12 @@ msgstr "%s скенер"
 #~ msgid "Restart..."
 #~ msgstr "Рестартиране..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Някои актуализации няма да имат ефект докато не рестартирате компютъра."
-
 #~ msgid "Restart Instead..."
 #~ msgstr "Рестартиране вместо това..."
 
 #~ msgid "Switch User..."
 #~ msgstr "Превключване на потребител..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Превключване от %s..."
 
@@ -332,7 +362,8 @@ msgstr "%s скенер"
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
 #~ msgstr "Прави така, че бутонът за излизане да не се показва в менюто."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "Прави така, че бутонът за рестартиране да не се показва в менюто."
 
 #~ msgid ""
diff --git a/po/bn.po b/po/bn.po
index 4724309..e69c4e0 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
 "PO-Revision-Date: 2011-09-25 12:06+0000\n"
 "Last-Translator: Zenat Rahnuma <Unknown>\n"
 "Language-Team: Bengali <ankur-bd-l10n@googlegroups.com>\n"
+"Language: bn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,276 +21,304 @@ msgstr ""
 "X-Language: bn_BD\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr ""
-"এটি এমন ভাবে তৈরি করুন যাতে সেশন মেনুতে লগ আউট বোতাম প্রদর্শন না করে।"
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr "লগ আউট, পুনরায় আরম্ভ এবং বন্ধ করার সময় নিশ্চিতকরণ ডায়ালগ রোধ"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-"এটি এমনভাবে তৈরি করুন যাতে সেশন মেনুতে পুনরায় শুরু বোতাম প্রদর্শন না করে।"
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
-"এটি এমন ভাবে তৈরি করুন যাতে সেশন মেনুতে শাট ডাউন বোতাম প্রদর্শন না করে।"
+"লগ আউট, পুনরায় আরম্ভ এবং বন্ধ করার সময় নিশ্চিতকরণ ডায়ালগ প্রদর্শন করা হবে কিনা।"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "সেশন মেনু থেকে লগ আউট আইটেম অপসারণ"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr "এটি এমন ভাবে তৈরি করুন যাতে সেশন মেনুতে লগ আউট বোতাম প্রদর্শন না করে।"
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "সেশন মেনু হতে রিস্টার্ট আইকন অপসারণ কর"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
-msgstr "সেশন মেনু হতে শাটডাউন আইকন অপসারণ কর"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr "এটি এমনভাবে তৈরি করুন যাতে সেশন মেনুতে পুনরায় শুরু বোতাম প্রদর্শন না করে।"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
-msgstr "লগ আউট, পুনরায় আরম্ভ এবং বন্ধ করার সময় নিশ্চিতকরণ ডায়ালগ রোধ"
+msgid "Remove the shutdown item from the session menu"
+msgstr "সেশন মেনু হতে শাটডাউন আইকন অপসারণ কর"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr "এটি এমন ভাবে তৈরি করুন যাতে সেশন মেনুতে শাট ডাউন বোতাম প্রদর্শন না করে।"
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"লগ আউট, পুনরায় আরম্ভ এবং বন্ধ করার সময় নিশ্চিতকরণ ডায়ালগ প্রদর্শন করা হবে "
-"কিনা।"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "ক্লাসিক গেষ্ট সেশন"
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "ক্লাসিক ডেস্কটপ ব্যবহার করে গেষ্ট সেশন আরম্ভ করুন"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "গেষ্ট"
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "পর্দা লক"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "বন্ধ"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "লগ আউট"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "পুনরায় আরম্ভ"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "সিস্টেম সেটিং..."
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "লগ আউট"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "অনলাইন অ্যাকাউন্ট..."
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "রিস্টার্ট..."
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "শাটডাউন..."
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "ব্যবহারকারীর একাউন্ট পরিবর্তন..."
+
+#: ../src/service.c:575 ../src/service.c:591
+#, fuzzy
+msgid "Switch Account"
+msgstr "ব্যবহারকারীর একাউন্ট পরিবর্তন..."
+
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "ব্যবহারকারীর একাউন্ট পরিবর্তন..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
+#: ../src/service.c:588
+#, fuzzy
+msgid "Lock/Switch Account"
+msgstr "ব্যবহারকারীর একাউন্ট পরিবর্তন..."
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "অতিথি সেশন"
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "লগ আউট"
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "লগ আউট"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "স্থগিত"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "নিদ্রিত অবস্থা"
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr "রিস্টার্ট..."
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
 msgid "Restart"
 msgstr "পুনরায় আরম্ভ"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr "শাটডাউন..."
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
 msgstr "বন্ধ"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
+msgstr "আপনি কি নিশ্চিত আপনি সব প্রোগ্রাম বন্ধ করে কম্পিউটার থেকে লগ আউট করতে চান?"
+
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
 msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+"Some software updates won't be applied until the computer next restarts."
 msgstr ""
-"আপনি কি নিশ্চিত আপনি সব প্রোগ্রাম বন্ধ করে কম্পিউটার থেকে লগ আউট করতে চান?"
+"কম্পিউটার পুনরায় আরম্ভ না হওয়া পর্যন্ত কিছু সফটওয়্যারের হালনাগাদ কার্যকর হবে না।"
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "বাতিল"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
+#: ../src/backend-dbus/actions.c:862
 msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr "আপনি কি নিশ্চিত আপনি সব প্রোগ্রাম বন্ধ করে কম্পিউটার পুনরায় আরম্ভ করতে চান?"
+
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr "আপনি কি নিশ্চিত আপনি সব প্রোগ্রাম বন্ধ করে কম্পিউটার বন্ধ করতে চান?"
+
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
-"আপনি কি নিশ্চিত আপনি সব প্রোগ্রাম বন্ধ করে কম্পিউটার পুনরায় আরম্ভ করতে চান?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
+#: ../src/backend-dbus/actions.c:1008
 msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
-msgstr "আপনি কি নিশ্চিত আপনি সব প্রোগ্রাম বন্ধ করে কম্পিউটার বন্ধ করতে চান?"
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "লগ আউট"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "পুনরায় আরম্ভ"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "বন্ধ"
+#~ msgid "Classic Guest Session"
+#~ msgstr "ক্লাসিক গেষ্ট সেশন"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "লগ আউট"
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "ক্লাসিক ডেস্কটপ ব্যবহার করে গেষ্ট সেশন আরম্ভ করুন"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr "পুনরায় শুরু করুন..."
+#~ msgid "Lock Screen"
+#~ msgstr "পর্দা লক"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr "বন্ধ করুন..."
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "লগ আউট"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "এর পরিবর্তে পুনরায় শুরু করুন"
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "পুনরায় আরম্ভ"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "এর পরিবর্তে পুনরায় শুরু করুন..."
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "বন্ধ"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
-"যতক্ষণ না কম্পিউটার পুনরায় শুরু করা হবে ততক্ষণ পর্যন্ত কিছু সফটওয়্যার "
-"হালনাগাদ প্রয়োগ করা যাবে না।"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "লগ আউট"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "বাতিল"
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "পুনরায় আরম্ভ"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "১"
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "বন্ধ"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr "ব্যবহারকারীর একাউন্ট পরিবর্তন..."
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "লগ আউট"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "%s থেকে পরিবর্তন…"
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "পুনরায় শুরু করুন..."
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "সফটওয়্যার হালনাগাদ"
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "বন্ধ করুন..."
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "হালনাগাদ বিদ্যমান..."
+#~ msgid "Restart Instead"
+#~ msgstr "এর পরিবর্তে পুনরায় শুরু করুন"
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "হালনাগাদ ইনস্টল করা হচ্ছে..."
+#~ msgid "Restart Instead…"
+#~ msgstr "এর পরিবর্তে পুনরায় শুরু করুন..."
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr "হালনাগাদ সম্পন্ন করতে পুনরায় শুরু করুন..."
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr ""
+#~ "যতক্ষণ না কম্পিউটার পুনরায় শুরু করা হবে ততক্ষণ পর্যন্ত কিছু সফটওয়্যার হালনাগাদ "
+#~ "প্রয়োগ করা যাবে না।"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "সিস্টেম সেটিং..."
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "১"
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "প্রদর্শন..."
+#~ msgid "Switch From %s…"
+#~ msgstr "%s থেকে পরিবর্তন…"
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "স্টার্ট আপ অ্যাপ্লিকেশন..."
+#~ msgid "Software Up to Date"
+#~ msgstr "সফটওয়্যার হালনাগাদ"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "ডিভাইস সংযুক্ত হয়েছে"
+#~ msgid "Updates Available…"
+#~ msgstr "হালনাগাদ বিদ্যমান..."
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "মুদ্রণযন্ত্র"
+#~ msgid "Updates Installing…"
+#~ msgstr "হালনাগাদ ইনস্টল করা হচ্ছে..."
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "স্ক্যানার"
+#~ msgid "Restart to Complete Updates…"
+#~ msgstr "হালনাগাদ সম্পন্ন করতে পুনরায় শুরু করুন..."
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "ওয়েব ক্যাম"
+#~ msgid "Displays…"
+#~ msgstr "প্রদর্শন..."
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "স্থগিত"
+#~ msgid "Startup Applications…"
+#~ msgstr "স্টার্ট আপ অ্যাপ্লিকেশন..."
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "নিদ্রিত অবস্থা"
+#~ msgid "Attached Devices"
+#~ msgstr "ডিভাইস সংযুক্ত হয়েছে"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "অতিথি সেশন"
+#~ msgid "Printers"
+#~ msgstr "মুদ্রণযন্ত্র"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "গেষ্ট"
+#~ msgid "Scanners"
+#~ msgstr "স্ক্যানার"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "অনলাইন অ্যাকাউন্ট..."
+#~ msgid "Webcam"
+#~ msgstr "ওয়েব ক্যাম"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "ব্যবহারকারীর অ্যাকাউন্ট"
+#~ msgid "User Accounts…"
+#~ msgstr "ব্যবহারকারীর অ্যাকাউন্ট"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "%s ওয়েবক্যাম"
+#~ msgid "%s Webcam"
+#~ msgstr "%s ওয়েবক্যাম"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "স্ক্যানার"
+#~ msgid "Scanner"
+#~ msgstr "স্ক্যানার"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "%s স্ক্যানার"
+#~ msgid "%s Scanner"
+#~ msgstr "%s স্ক্যানার"
 
 #~ msgid "Log Out..."
 #~ msgstr "লগ আউট..."
@@ -314,15 +343,9 @@ msgstr "%s স্ক্যানার"
 #~ msgid "Restart Instead..."
 #~ msgstr "পুনরায় আরম্ভ..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "কম্পিউটার পুনরায় আরম্ভ না হওয়া পর্যন্ত কিছু সফটওয়্যারের হালনাগাদ কার্যকর হবে "
-#~ "না।"
-
 #~ msgid "Switch User..."
 #~ msgstr "ব্যবহারকারী পরিবর্তন..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "%s হতে স্যুইচ করুন..."
 
@@ -332,7 +355,8 @@ msgstr "%s স্ক্যানার"
 #~ msgid "Restart to Complete Update…"
 #~ msgstr "আপডেট সম্পন্ন করতে রিস্টার্ট..."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "এটি এমন করে যেন সেশন মেনুতে রিস্টার্ট বাটন না দেখায়।"
 
 #~ msgid ""
diff --git a/po/bo.po b/po/bo.po
index 895eee5..7273241 100644
--- a/po/bo.po
+++ b/po/bo.po
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
 "PO-Revision-Date: 2011-02-25 08:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Tibetan <bo@li.org>\n"
+"Language: bo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,282 +19,238 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
 msgstr ""
+"ཕྱིར་འཐེན་ངོས་འཛིན་བཀག་འགོག འགོ་བསྐྱར་འཛུགས་བྱེད་པ་དང་སྒོ་རྒྱག་བཀོལ་སྤྱོད་གླེང་སྒྲོམ་མངོན་འཆར་བྱེད་པ"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
-msgstr ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr "ཕྱིར་འདོན་དང་འགོ་བསྐྱར་འཛུགས། སྒོ་རྒྱག་པའི་སྐབས་ངོས་འཛིན་གླེང་སྒྲོམ་མངོན་འཆར་བྱེད་དམ"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "ཕྱིར་འདོན་ལེ་ཚན་འདེམས་ཐོའི་ནང་ནས་བསུབ་པ"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "འགོ་བསྐྱར་འཛུགས་འདི་ལེ་ཚན་འདེམས་ཐོའི་ནང་ནས་བསུབ་པ"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
-msgstr "སྒོ་རྒྱག་དེ་ལེ་ཚན་འདེམས་ཐོའི་ནང་ནས་བསུབ་པ"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
-msgstr ""
-"ཕྱིར་འཐེན་ངོས་འཛིན་བཀག་འགོག "
-"འགོ་བསྐྱར་འཛུགས་བྱེད་པ་དང་སྒོ་རྒྱག་བཀོལ་སྤྱོད་གླེང་སྒྲོམ་མངོན་འཆར་བྱེད་པ"
+msgid "Remove the shutdown item from the session menu"
+msgstr "སྒོ་རྒྱག་དེ་ལེ་ཚན་འདེམས་ཐོའི་ནང་ནས་བསུབ་པ"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
-"ཕྱིར་འདོན་དང་འགོ་བསྐྱར་འཛུགས། "
-"སྒོ་རྒྱག་པའི་སྐབས་ངོས་འཛིན་གླེང་སྒྲོམ་མངོན་འཆར་བྱེད་དམ"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "འཆར་ངོས་ཟྭ་རྒྱག"
-
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "སྒོ་རྒྱག་པ"
-
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "ཕྱིར་འདོན"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "འགོ་བསྐྱར་འཛུགས"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "ཕྱིར་འདོན་་་"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "འགོ་བསྐྱར་འཛུགས་་་"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "སྒོ་རྒྱག་པ་་་"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "ཕྱིར་འདོན"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "འགོ་བསྐྱར་འཛུགས"
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
-msgstr "སྒོ་རྒྱག་པ"
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
 msgstr ""
-"ཁྱོད་ཀྱིས་བྱ་རིམ་ཡོངས་རྫོགས་སྒོ་རྒྱག་པ་དང་རྩིས་འཁོར་ནས་ཕྱིར་འདོན་པ་གཏན་ཁེལ་ཡི"
-"ན་ནམ"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
 msgstr ""
-"ཁྱོད་ཀྱིས་བྱ་རིམ་ཡོངས་རྫོགས་སྒོ་བརྒྱབ་ནས་རྩིས་འཁོར་འགོ་བསྐྱར་འཛུགས་བྱེད་པ་གཏན"
-"་ཁེལ་ཡིན་ནམ"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
 msgstr ""
-"ཁྱོད་ཀྱིས་བྱ་རིམ་ཡོངས་རྫོགས་སྒོ་རྒྱག་པ་དང་རྩིས་འཁོར་སྒོ་རྒྱག་པར་གཏན་ཁེལལ་ཡིན་"
-"ནམ？"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "ཕྱིར་འདོན་པ"
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "འགོ་བསྐྱར་འཛུགས"
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "སྐུ་མགྲོན་ལེ་ཚན"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "སྒོ་རྒྱག་པ"
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "ཕྱིར་འདོན་་་"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
-msgstr "ཕྱིར་འདོན་པ"
+msgstr "ཕྱིར་འདོན"
+
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "བཀལ་བ"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "ངལ་གསོ"
+
+#: ../src/service.c:722
 msgid "Restart…"
-msgstr ""
+msgstr "འགོ་བསྐྱར་འཛུགས་་་"
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "འགོ་བསྐྱར་འཛུགས"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
+#: ../src/service.c:729
 msgid "Shut Down…"
-msgstr ""
+msgstr "སྒོ་རྒྱག་པ་་་"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "འགོ་བསྐྱར་འཛུགས"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr "སྒོ་རྒྱག་པ"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
+msgstr "ཁྱོད་ཀྱིས་བྱ་རིམ་ཡོངས་རྫོགས་སྒོ་རྒྱག་པ་དང་རྩིས་འཁོར་ནས་ཕྱིར་འདོན་པ་གཏན་ཁེལ་ཡིན་ནམ"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr "རྩིས་འཁོར་འགོ་བསྐྱར་འཛུགས་མ་བྱས་པར་མཉེན་ཆས་གསར་སྒྱུར་གྱི་ཕན་འབྲས་མི་ཐོན"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
 msgid "Cancel"
 msgstr "རྩིས་མེད་གཏོང"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "སྤྱོད་མཁན་བརྗེ་རེས..."
-
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr ""
-
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr ""
-
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr ""
-
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr ""
-
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr ""
-
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr ""
-
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr "ཁྱོད་ཀྱིས་བྱ་རིམ་ཡོངས་རྫོགས་སྒོ་བརྒྱབ་ནས་རྩིས་འཁོར་འགོ་བསྐྱར་འཛུགས་བྱེད་པ་གཏན་ཁེལ་ཡིན་ནམ"
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr "ཁྱོད་ཀྱིས་བྱ་རིམ་ཡོངས་རྫོགས་སྒོ་རྒྱག་པ་དང་རྩིས་འཁོར་སྒོ་རྒྱག་པར་གཏན་ཁེལལ་ཡིན་ནམ？"
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr ""
+#~ msgid "Lock Screen"
+#~ msgstr "འཆར་ངོས་ཟྭ་རྒྱག"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "བཀལ་བ"
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "ཕྱིར་འདོན"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "ངལ་གསོ"
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "འགོ་བསྐྱར་འཛུགས"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "སྐུ་མགྲོན་ལེ་ཚན"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "སྒོ་རྒྱག་པ"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "ཕྱིར་འདོན་པ"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "འགོ་བསྐྱར་འཛུགས"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "སྒོ་རྒྱག་པ"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr ""
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "ཕྱིར་འདོན་པ"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr ""
+#~ msgid "Restart Instead"
+#~ msgstr "འགོ་བསྐྱར་འཛུགས"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr ""
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "སྤྱོད་མཁན་བརྗེ་རེས..."
 
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
 #~ msgstr "ཕྱིར་འདོན་གནོན་མཐེབ་ལེ་ཚན་འདེམས་ཐོའི་ནང་དུ་འཆར་དུ་མི་འཇུག"
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "འགོ་བསྐྱར་འཛུགས་གནོན་མཐེབ་ལེ་ཚན་འདེམས་ཐོའི་ནང་དུ་འཆར་དུ་མི་འཇུག"
 
 #~ msgid ""
@@ -320,17 +277,12 @@ msgstr ""
 #~ msgid "Restart Instead..."
 #~ msgstr "འགོ་བསྐྱར་འཛུགས་..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "རྩིས་འཁོར་འགོ་བསྐྱར་འཛུགས་མ་བྱས་པར་མཉེན་ཆས་གསར་སྒྱུར་གྱི་ཕན་འབྲས་མི་ཐོན"
-
 #~ msgid "Session"
 #~ msgstr "ལེ་ཚན"
 
 #~ msgid "Switch User..."
 #~ msgstr "སྤྱོད་མཁན་བརྗེ་རེས..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "%s་ནས་བརྗེ་བ..."
 
diff --git a/po/br.po b/po/br.po
index 2f37000..1a9584f 100644
--- a/po/br.po
+++ b/po/br.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
 "PO-Revision-Date: 2010-12-29 22:54+0000\n"
 "Last-Translator: Ken VanDine <ken.vandine@canonical.com>\n"
 "Language-Team: Breton <br@li.org>\n"
+"Language: br\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,276 +19,242 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
 msgstr ""
+"Dilemel ar voestad emziviz da gadarnaat an dilugañ, lazhañ hag adloc'hañ"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
+"Diskouez pe get ar voestad emziviz da gadarnaat an dilugañ, lazhañ hag "
+"adloc'hañ."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Dilemel an ergorenn Digennaskañ diwar lañser an estez"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgid "Remove the shutdown item from the session menu"
 msgstr ""
-"Dilemel ar voestad emziviz da gadarnaat an dilugañ, lazhañ hag adloc'hañ"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
-"Diskouez pe get ar voestad emziviz da gadarnaat an dilugañ, lazhañ hag "
-"adloc'hañ."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Prennañ ar skramm"
-
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Lazhañ"
-
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Dilugañ"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Adloc'hañ"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Dilugañ..."
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Adloc'hañ..."
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Lazhañ..."
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "Dilugañ"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "Adloc'hañ"
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
-msgstr "Lazhañ"
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
 msgstr ""
-"Ha fellout a ra deoc'h serriñ an holl c'houlevioù hag en em zilugañ diouzh "
-"hoc'h urzhiataer ?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
 msgstr ""
-"Ha fellout a ra deoc'h serriñ an holl c'houlevioù hag adloc'hañ hoc'h "
-"urzhiataer ?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
 msgstr ""
-"Ha fellout a ra deoc'h serriñ an holl c'houlevioù ha lazhañ hoc'h urzhiataer "
-"?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "Dilugañ"
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Adloc'hañ"
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Estez ur c'houviad"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Lazhañ"
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Dilugañ..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Dilugañ"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Lakaat da gousket"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Goañviñ"
+
+#: ../src/service.c:722
 msgid "Restart…"
-msgstr ""
+msgstr "Adloc'hañ..."
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "Adloc'hañ"
+
+#: ../src/service.c:729
 msgid "Shut Down…"
-msgstr ""
+msgstr "Lazhañ..."
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Adloc'hañ kentoc'h"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr "Lazhañ"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr ""
+"Ha fellout a ra deoc'h serriñ an holl c'houlevioù hag en em zilugañ diouzh "
+"hoc'h urzhiataer ?"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
 msgstr ""
+"Ret e vo adloc'hañ hoc'h urzhiataer a-benn ma vo efedus hizivadurioù ar "
+"meziantoù."
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
 msgid "Cancel"
 msgstr "Dilezel"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "1"
-
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr ""
-
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr ""
-
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr ""
-
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
+"Ha fellout a ra deoc'h serriñ an holl c'houlevioù hag adloc'hañ hoc'h "
+"urzhiataer ?"
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
+"Ha fellout a ra deoc'h serriñ an holl c'houlevioù ha lazhañ hoc'h "
+"urzhiataer ?"
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr ""
+#~ msgid "Lock Screen"
+#~ msgstr "Prennañ ar skramm"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Dilugañ"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Adloc'hañ"
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Lazhañ"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Lakaat da gousket"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Dilugañ"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Goañviñ"
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Adloc'hañ"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Estez ur c'houviad"
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Lazhañ"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr ""
-
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr ""
-
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr ""
-
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr ""
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Dilugañ"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr ""
+#~ msgid "Restart Instead"
+#~ msgstr "Adloc'hañ kentoc'h"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr ""
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "1"
 
 #~ msgid "Restart..."
 #~ msgstr "Adloc'hañ..."
@@ -312,16 +279,10 @@ msgstr ""
 #~ msgid "Shut Down..."
 #~ msgstr "Lazhañ..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Ret e vo adloc'hañ hoc'h urzhiataer a-benn ma vo efedus hizivadurioù ar "
-#~ "meziantoù."
-
 #~ msgctxt "button auth"
 #~ msgid "Restart..."
 #~ msgstr "Adloc'hañ..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Trec'haoliñ diouzh %s..."
 
diff --git a/po/bs.po b/po/bs.po
index 3527636..2945715 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
 "PO-Revision-Date: 2011-09-16 23:07+0000\n"
 "Last-Translator: Samir Ribić <Unknown>\n"
 "Language-Team: Bosnian <bs@li.org>\n"
+"Language: bs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,277 +19,312 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr "Čini da se dugme za odjavu ne pojaljuje u sesijskom meniju"
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+"Zaobiđi dijaloški prozor za potvrdu odjave, resetovanja i gašenja računara"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgid ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
-"Čini da se dugme za ponovno pokretanje sistema ne pojaljuje u sesijskom "
-"meniju"
+"Da li da prikaže ili ne dijaloge potvrde za akcije odjavljivanja, "
+"restartovanja i gašenja."
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
-msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
-msgstr "Čini da se dugme za gašenje ne pojaljuje u sesijskom meniju"
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
 msgid "Remove the Log Out item from the session menu"
 msgstr "Ukloni stavku Odjavljivanja iz menija sesije"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr "Čini da se dugme za odjavu ne pojaljuje u sesijskom meniju"
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Ukloni stavku Restartovanja iz menija sesije"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
+"Čini da se dugme za ponovno pokretanje sistema ne pojaljuje u sesijskom "
+"meniju"
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
 msgid "Remove the shutdown item from the session menu"
 msgstr "Ukloni stavku Gašenja iz menija sesije"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr "Čini da se dugme za gašenje ne pojaljuje u sesijskom meniju"
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"Zaobiđi dijaloški prozor za potvrdu odjave, resetovanja i gašenja računara"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
-"Da li da prikaže ili ne dijaloge potvrde za akcije odjavljivanja, "
-"restartovanja i gašenja."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "Klasična sesija gosta"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "Gost"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "Pokreni gostujuću sesiiju koristeći klasični desktop"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Zaključaj ekran"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Ugasi"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Odjava"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "Sistemske postavke..."
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Ponovo pokreni"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "Mrežni nalozi..."
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Odjava ..."
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Restartovanje..."
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "Promijeni korisnički račun..."
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Gašenje..."
+#: ../src/service.c:575 ../src/service.c:591
+#, fuzzy
+msgid "Switch Account"
+msgstr "Promijeni korisnički račun..."
+
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "Promijeni korisnički račun..."
+
+#: ../src/service.c:588
+#, fuzzy
+msgid "Lock/Switch Account"
+msgstr "Promijeni korisnički račun..."
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Sesija za goste"
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Odjava ..."
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Odjava"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Suspendiraj"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Hibernacija"
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr "Restartovanje..."
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
 msgid "Restart"
 msgstr "Ponovo pokreni"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr "Gašenje..."
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
 msgstr "Ugasi"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr ""
 "Da li ste sigurni da želite da zatvorite sve programe i da se odjavite sa "
 "računara?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+"Neka ažuriranja softvera se neće primjeniti sve do sledećeg restartovanja "
+"računara."
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "Otkaži"
+
+#: ../src/backend-dbus/actions.c:862
 msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
 "Da li ste sigurni da želite da zatvorite sve programe i da restartujete "
 "računar?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
 "Da li ste sigurni da želite da zatvorite sve programe i da ugasite računar?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "Odjava"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Ponovo pokreni"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Ugasi"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Odjava"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr "Restartovanje..."
+#~ msgid "Classic Guest Session"
+#~ msgstr "Klasična sesija gosta"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr "Gašenje..."
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "Pokreni gostujuću sesiiju koristeći klasični desktop"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Restartuj umjesto toga"
+#~ msgid "Lock Screen"
+#~ msgstr "Zaključaj ekran"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "Ponovo pokreniumjeso toga"
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Odjava"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr "Neke nadogradnje se neće primijeniti do novog podizanja računara."
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Ponovo pokreni"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "Otkaži"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Ugasi"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "0"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Odjava"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr "Promijeni korisnički račun..."
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Ponovo pokreni"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "Promijeni sa %s…"
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Ugasi"
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "Softver ažuran"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Odjava"
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "Dostupne nadogradnje..."
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "Restartovanje..."
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "Instaliram nadogradnje..."
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "Gašenje..."
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr "Ponovo pokreni da sa završe nadogradnje…"
+#~ msgid "Restart Instead"
+#~ msgstr "Restartuj umjesto toga"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "Sistemske postavke..."
+#~ msgid "Restart Instead…"
+#~ msgstr "Ponovo pokreniumjeso toga"
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "Displeji..."
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr "Neke nadogradnje se neće primijeniti do novog podizanja računara."
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "Pokretačke aplikacije…"
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "0"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "Priključeni uređaji"
+#~ msgid "Switch From %s…"
+#~ msgstr "Promijeni sa %s…"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "Štampači"
+#~ msgid "Software Up to Date"
+#~ msgstr "Softver ažuran"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "Skeneri"
+#~ msgid "Updates Available…"
+#~ msgstr "Dostupne nadogradnje..."
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "Web kamera"
+#~ msgid "Updates Installing…"
+#~ msgstr "Instaliram nadogradnje..."
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Suspendiraj"
+#~ msgid "Restart to Complete Updates…"
+#~ msgstr "Ponovo pokreni da sa završe nadogradnje…"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Hibernacija"
+#~ msgid "Displays…"
+#~ msgstr "Displeji..."
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Sesija za goste"
+#~ msgid "Startup Applications…"
+#~ msgstr "Pokretačke aplikacije…"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "Gost"
+#~ msgid "Attached Devices"
+#~ msgstr "Priključeni uređaji"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "Mrežni nalozi..."
+#~ msgid "Printers"
+#~ msgstr "Štampači"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "Korisnički nalozi…"
+#~ msgid "Scanners"
+#~ msgstr "Skeneri"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "%s Web kamera"
+#~ msgid "Webcam"
+#~ msgstr "Web kamera"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "Skener"
+#~ msgid "User Accounts…"
+#~ msgstr "Korisnički nalozi…"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "%s skener"
+#~ msgid "%s Webcam"
+#~ msgstr "%s Web kamera"
+
+#~ msgid "Scanner"
+#~ msgstr "Skener"
+
+#~ msgid "%s Scanner"
+#~ msgstr "%s skener"
 
 #~ msgid "Restart..."
 #~ msgstr "Ponovo pokreni..."
@@ -299,14 +335,14 @@ msgstr "%s skener"
 #~ msgid "Shut Down..."
 #~ msgstr "Ugasi..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Pređi sa %s..."
 
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
 #~ msgstr "Čini da se taster za odjavljivanje ne prikazuje u meniju sesije."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "Čini da se dugme za restartovanja ne prikazuje u meniju sesije"
 
 #~ msgid ""
@@ -321,11 +357,6 @@ msgstr "%s skener"
 #~ msgid "Shut Down..."
 #~ msgstr "Ugasi..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Neka ažuriranja softvera se neće primjeniti sve do sledećeg restartovanja "
-#~ "računara."
-
 #~ msgid "Restart Instead..."
 #~ msgstr "Restartuj umjest toga..."
 
diff --git a/po/ca.po b/po/ca.po
index ea97ef3..d9015c7 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
 "PO-Revision-Date: 2011-09-21 20:23+0000\n"
 "Last-Translator: Joan Duran <jodufi@gmail.com>\n"
 "Language-Team: Catalan <ca@li.org>\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,274 +19,285 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
 msgstr ""
+"Suprimeix el diàleg per a confirmar les accions de sortida, reinici i aturada"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
+"Si s'han de mostrar diàlegs de confirmació per a les accions de sortida, "
+"reinici i aturada."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Oculta l'opció de sortida de la sessió del menú de sessió"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Suprimeix l'element de reinici del menú de la sessió"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
-msgstr "Suprimeix l'element d'aturada del menú de la sessió"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
-msgstr ""
-"Suprimeix el diàleg per a confirmar les accions de sortida, reinici i aturada"
+msgid "Remove the shutdown item from the session menu"
+msgstr "Suprimeix l'element d'aturada del menú de la sessió"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
-"Si s'han de mostrar diàlegs de confirmació per a les accions de sortida, "
-"reinici i aturada."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "Sessió de convidat clàssica"
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
+msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "Inicia una sessiió de convidat utilitzant l'escriptori clàssic"
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Bloca la pantalla"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "Convidat"
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Atura"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Surt"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Reinicia"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Surt…"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "Paràmetres del sistema…"
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Reinicia..."
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "Comptes en línia…"
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Atura…"
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "Surt"
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "Comptes en línia…"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "Reinicia"
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
-msgstr "Atura"
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "Comptes en línia…"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
 msgstr ""
-"Esteu segur que voleu tancar tots els programes i finalitzar la sessió en "
-"aquest ordinador?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
+#: ../src/service.c:594
+msgid "Lock"
 msgstr ""
-"Esteu segur que voleu tancar tots els programes i reiniciar l'ordinador?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
-msgstr ""
-"Esteu segur que voleu tancar tots els programes i aturar l'ordinador?"
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Sessió de convidat"
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Surt…"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Surt"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Reinicia"
-
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Atura"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Atura temporalment"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Surt"
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Hiberna"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
+#: ../src/service.c:722
 msgid "Restart…"
 msgstr "Reinicia..."
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "Reinicia"
+
+#: ../src/service.c:729
 msgid "Shut Down…"
 msgstr "Atura…"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Reinicia en lloc d'això"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr "Atura"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr ""
+"Esteu segur que voleu tancar tots els programes i finalitzar la sessió en "
+"aquest ordinador?"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
 msgstr ""
+"Algunes actualitzacions de programari no s'aplicaran fins que es reiniciï "
+"l'ordinador."
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "0"
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr ""
+"Esteu segur que voleu tancar tots els programes i reiniciar l'ordinador?"
+
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr "Esteu segur que voleu tancar tots els programes i aturar l'ordinador?"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "Actualitzacions de programari"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "Hi ha actualitzacions disponibles…"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "S'estan instal·lant actualitzacions…"
+#~ msgid "Classic Guest Session"
+#~ msgstr "Sessió de convidat clàssica"
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr ""
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "Inicia una sessiió de convidat utilitzant l'escriptori clàssic"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "Paràmetres del sistema…"
+#~ msgid "Lock Screen"
+#~ msgstr "Bloca la pantalla"
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "Monitors…"
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Surt"
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "Aplicacions d'inici…"
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Reinicia"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "Dispositius connectats"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Atura"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "Impressores"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Surt"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "Escàners"
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Reinicia"
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "Càmera web"
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Atura"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Atura temporalment"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Surt"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Hiberna"
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "Reinicia..."
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Sessió de convidat"
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "Atura…"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "Convidat"
+#~ msgid "Restart Instead"
+#~ msgstr "Reinicia en lloc d'això"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "Comptes en línia…"
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "0"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr ""
+#~ msgid "Software Up to Date"
+#~ msgstr "Actualitzacions de programari"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr ""
+#~ msgid "Updates Available…"
+#~ msgstr "Hi ha actualitzacions disponibles…"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "Escànner"
+#~ msgid "Updates Installing…"
+#~ msgstr "S'estan instal·lant actualitzacions…"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr ""
+#~ msgid "Displays…"
+#~ msgstr "Monitors…"
+
+#~ msgid "Startup Applications…"
+#~ msgstr "Aplicacions d'inici…"
+
+#~ msgid "Attached Devices"
+#~ msgstr "Dispositius connectats"
+
+#~ msgid "Printers"
+#~ msgstr "Impressores"
+
+#~ msgid "Scanners"
+#~ msgstr "Escàners"
+
+#~ msgid "Webcam"
+#~ msgstr "Càmera web"
+
+#~ msgid "Scanner"
+#~ msgstr "Escànner"
 
 #~ msgid "Restart..."
 #~ msgstr "Reinicia..."
@@ -303,7 +315,6 @@ msgstr ""
 #~ msgid "Restart..."
 #~ msgstr "Reinicia..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Canvieu l'usuari %s..."
 
@@ -311,18 +322,14 @@ msgstr ""
 #~ msgid "Shut Down..."
 #~ msgstr "Atura..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Algunes actualitzacions de programari no s'aplicaran fins que es reiniciï "
-#~ "l'ordinador."
-
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
 #~ msgstr "Oculta l'opció de sortida de la sessió del menú de sessió."
 
 #~ msgid "Restart Instead..."
 #~ msgstr "Reinicia en lloc d'això..."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "Fes que el botó de reinici no es mostri al menú de la sessió."
 
 #~ msgid ""
diff --git a/po/ca@valencia.po b/po/ca@valencia.po
index 92c3390..4a1b32f 100644
--- a/po/ca@valencia.po
+++ b/po/ca@valencia.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
 "PO-Revision-Date: 2011-02-25 03:34+0000\n"
 "Last-Translator: David Planella <david.planella@ubuntu.com>\n"
 "Language-Team: Catalan <ca@li.org>\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,273 +19,239 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
 msgstr ""
+"Suprimeix el diàleg per a confirmar les accions d'eixida, reinici i parada"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
+"Si s'han de mostrar diàlegs de confirmació per a les accions d'eixida, "
+"reinici i parada."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Oculta l'opció d'eixida de la sessió del menú de sessió"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Suprimeix l'element de reinici del menú de la sessió"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
-msgstr "Suprimeix l'element d'parada del menú de la sessió"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
-msgstr ""
-"Suprimeix el diàleg per a confirmar les accions d'eixida, reinici i parada"
+msgid "Remove the shutdown item from the session menu"
+msgstr "Suprimeix l'element d'parada del menú de la sessió"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
-"Si s'han de mostrar diàlegs de confirmació per a les accions d'eixida, "
-"reinici i parada."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Bloca la pantalla"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Para"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Ix"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Reinicia"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Ix…"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Reinicia..."
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Para…"
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "Ix"
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "Reinicia"
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
-msgstr "Para"
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
 msgstr ""
-"Esteu segur que voleu tancar tots els programes i finalitzar la sessió en "
-"este ordinador?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
+#: ../src/service.c:594
+msgid "Lock"
 msgstr ""
-"Esteu segur que voleu tancar tots els programes i reiniciar l'ordinador?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
-msgstr "Esteu segur que voleu tancar tots els programes i parar l'ordinador?"
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Sessió de convidat"
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Ix…"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Ix"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Reinicia"
-
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Para"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Para temporalment"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Ix"
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Hiberna"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
+#: ../src/service.c:722
 msgid "Restart…"
-msgstr ""
+msgstr "Reinicia..."
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "Reinicia"
+
+#: ../src/service.c:729
 msgid "Shut Down…"
-msgstr ""
+msgstr "Para…"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Reinicia en lloc d'això"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr "Para"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr ""
+"Esteu segur que voleu tancar tots els programes i finalitzar la sessió en "
+"este ordinador?"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
 msgstr ""
+"Algunes actualitzacions de programari no s'aplicaran fins que es reinicie "
+"l'ordinador."
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "0"
-
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr ""
-
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr ""
-
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr ""
-
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
+"Esteu segur que voleu tancar tots els programes i reiniciar l'ordinador?"
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr "Esteu segur que voleu tancar tots els programes i parar l'ordinador?"
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr ""
+#~ msgid "Lock Screen"
+#~ msgstr "Bloca la pantalla"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Ix"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Reinicia"
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Para"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Para temporalment"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Ix"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Hiberna"
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Reinicia"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Sessió de convidat"
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Para"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr ""
-
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr ""
-
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr ""
-
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr ""
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Ix"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr ""
+#~ msgid "Restart Instead"
+#~ msgstr "Reinicia en lloc d'això"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr ""
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "0"
 
 #~ msgid "Log Out..."
 #~ msgstr "Ix..."
@@ -295,7 +262,8 @@ msgstr ""
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
 #~ msgstr "Oculta l'opció d'eixida de la sessió del menú de sessió."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "Fes que el botó de reinici no es mostre al menú de la sessió."
 
 #~ msgid ""
@@ -316,18 +284,12 @@ msgstr ""
 #~ msgid "Restart Instead..."
 #~ msgstr "Reinicia en lloc d'això..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Algunes actualitzacions de programari no s'aplicaran fins que es reinicie "
-#~ "l'ordinador."
-
 #~ msgid "Session"
 #~ msgstr "Sessió"
 
 #~ msgid "Switch User..."
 #~ msgstr "Canvia d'usuari..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Canvieu l'usuari %s..."
 
diff --git a/po/ce.po b/po/ce.po
new file mode 100644
index 0000000..dd2eb5a
--- /dev/null
+++ b/po/ce.po
@@ -0,0 +1,204 @@
+# Chechen translations for PACKAGE package.
+# Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
+"PO-Revision-Date: 2017-07-21 15:41+0200\n"
+"Last-Translator: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n"
+"Language-Team: Chechen\n"
+"Language: ce\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
+msgid ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
+msgid "Remove the Log Out item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
+msgid "Remove the Restart item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
+msgid "Remove the shutdown item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr ""
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
+msgstr ""
+
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
+
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
+
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
+
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
+
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
+
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
+
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
+
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
+
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
+
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
+
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
+
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
+msgstr ""
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr ""
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr ""
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
+msgid "Log Out"
+msgstr ""
+
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr ""
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr ""
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr ""
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr ""
+
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr ""
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:818
+msgid "Are you sure you want to close all programs and log out?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:819
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
diff --git a/po/ckb.po b/po/ckb.po
new file mode 100644
index 0000000..800fbc7
--- /dev/null
+++ b/po/ckb.po
@@ -0,0 +1,204 @@
+# Language ckb translations for PACKAGE package.
+# Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
+"PO-Revision-Date: 2017-07-21 15:41+0200\n"
+"Last-Translator: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n"
+"Language-Team: Language ckb\n"
+"Language: ckb\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
+msgid ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
+msgid "Remove the Log Out item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
+msgid "Remove the Restart item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
+msgid "Remove the shutdown item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr ""
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
+msgstr ""
+
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
+
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
+
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
+
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
+
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
+
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
+
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
+
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
+
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
+
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
+
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
+
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
+msgstr ""
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr ""
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr ""
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
+msgid "Log Out"
+msgstr ""
+
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr ""
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr ""
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr ""
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr ""
+
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr ""
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:818
+msgid "Are you sure you want to close all programs and log out?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:819
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
diff --git a/po/co.po b/po/co.po
new file mode 100644
index 0000000..2f43a27
--- /dev/null
+++ b/po/co.po
@@ -0,0 +1,204 @@
+# Corsican translations for PACKAGE package.
+# Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
+"PO-Revision-Date: 2017-07-21 15:41+0200\n"
+"Last-Translator: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n"
+"Language-Team: Corsican\n"
+"Language: co\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
+msgid ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
+msgid "Remove the Log Out item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
+msgid "Remove the Restart item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
+msgid "Remove the shutdown item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr ""
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
+msgstr ""
+
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
+
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
+
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
+
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
+
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
+
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
+
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
+
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
+
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
+
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
+
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
+
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
+msgstr ""
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr ""
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr ""
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
+msgid "Log Out"
+msgstr ""
+
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr ""
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr ""
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr ""
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr ""
+
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr ""
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:818
+msgid "Are you sure you want to close all programs and log out?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:819
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
diff --git a/po/crh.po b/po/crh.po
index a667722..97a9129 100644
--- a/po/crh.po
+++ b/po/crh.po
@@ -7,11 +7,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
 "PO-Revision-Date: 2011-05-03 11:34+0000\n"
 "Last-Translator: Reşat SABIQ <tilde.birlik@gmail.com>\n"
-"Language-Team: QIRIMTATARCA (Qırım Türkçesi) <tilde-birlik-"
-"tercime@lists.sourceforge.net>\n"
+"Language-Team: QIRIMTATARCA (Qırım Türkçesi) <tilde-birlik-tercime@lists."
+"sourceforge.net>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,277 +20,243 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
 msgstr ""
+"Tışarı imzalanuv, kene başlatuv ve qapatuv amellerini tasdiq etüv dialogını "
+"bastırıqla"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
+"Tışarı imzalanuv, kene başlatuv ve qapatuv amelleri içün tasdiq "
+"dialoglarınıñ kösterilip kösterilmeycegi."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Tışarı İmzalan unsurını oturım menüsinden çetleştir"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Kene Başlat unsurını oturım menüsinden çetleştir"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
-msgstr "Qapat unsurını oturım menüsinden çetleştir"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
-msgstr ""
-"Tışarı imzalanuv, kene başlatuv ve qapatuv amellerini tasdiq etüv dialogını "
-"bastırıqla"
+msgid "Remove the shutdown item from the session menu"
+msgstr "Qapat unsurını oturım menüsinden çetleştir"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
-"Tışarı imzalanuv, kene başlatuv ve qapatuv amelleri içün tasdiq "
-"dialoglarınıñ kösterilip kösterilmeycegi."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Ekrannı Kilitle"
-
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Qapat"
-
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Tışarı İmzalan"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Kene Başlat"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Tışarı İmzalan…"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Kene Başlat…"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Qapat…"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "Tışarı İmzalan"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "Kene Başlat"
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
-msgstr "Qapat"
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
 msgstr ""
-"Programlarnıñ episini qapatıp bilgisayardan tışarı imzalanmağa "
-"istegeniñizden eminsiñizmi?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
 msgstr ""
-"Programlarnıñ episini qapatıp bilgisayarnı kene başlatmağa istegeniñizden "
-"eminsiñizmi?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
 msgstr ""
-"Programlarnıñ episini qapatıp bilgisayarnı sürgülemege istegeniñizden "
-"eminsiñizmi?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "Tışarı İmzalan"
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Kene Başlat"
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Musafir Oturımı"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Qapat"
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Tışarı İmzalan…"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Tışarı İmzalan"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Sarqıt"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Yuqlat"
+
+#: ../src/service.c:722
 msgid "Restart…"
-msgstr ""
+msgstr "Kene Başlat…"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "Kene Başlat"
+
+#: ../src/service.c:729
 msgid "Shut Down…"
-msgstr ""
+msgstr "Qapat…"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Onıñ Yerine Kene Başlat"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr "Qapat"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr ""
+"Programlarnıñ episini qapatıp bilgisayardan tışarı imzalanmağa "
+"istegeniñizden eminsiñizmi?"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
 msgstr ""
+"Bilgisayarnıñ soñraki kene başlatıluvınace bazı yazılım yañartmaları "
+"uyğulanmaz."
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
 msgid "Cancel"
 msgstr "Vazgeç"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "1"
-
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr ""
-
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr ""
-
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr ""
-
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
+"Programlarnıñ episini qapatıp bilgisayarnı kene başlatmağa istegeniñizden "
+"eminsiñizmi?"
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
+"Programlarnıñ episini qapatıp bilgisayarnı sürgülemege istegeniñizden "
+"eminsiñizmi?"
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr ""
+#~ msgid "Lock Screen"
+#~ msgstr "Ekrannı Kilitle"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Tışarı İmzalan"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Kene Başlat"
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Qapat"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Sarqıt"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Tışarı İmzalan"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Yuqlat"
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Kene Başlat"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Musafir Oturımı"
-
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr ""
-
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr ""
-
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Qapat"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr ""
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Tışarı İmzalan"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr ""
+#~ msgid "Restart Instead"
+#~ msgstr "Onıñ Yerine Kene Başlat"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr ""
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "1"
 
 #~ msgid "Restart..."
 #~ msgstr "Kene Başlat..."
@@ -317,17 +284,12 @@ msgstr ""
 #~ msgid "Restart Instead..."
 #~ msgstr "Onıñ Yerine Kene Başlat..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Bilgisayarnıñ soñraki kene başlatıluvınace bazı yazılım yañartmaları "
-#~ "uyğulanmaz."
-
 # tüklü
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "%s Qullanıcısından Almaş..."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "Oturım menüsindeki kene başlatma dögmesini körünmez yapar."
 
 #~ msgid ""
diff --git a/po/cs.po b/po/cs.po
index 41b80a2..0e29f4a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
 "PO-Revision-Date: 2011-09-26 09:57+0000\n"
 "Last-Translator: Vojtěch Trefný <vojtech.trefny@gmail.com>\n"
 "Language-Team: Czech\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,270 +19,304 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr "Nezobrazí tlačítko odhlášení v nabídce sezení."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+"Potlačit dialogové okno pro potvrzení odhlášení, restartování a vypnutí"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr "Nezobrazí tlačítko restart v nabídce sezení."
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
-msgstr "Nezobrazí tlačítko vypnutí v nabídce sezení."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+"Určuje, zda se mají či nemají zobrazovat potvrzující dialogová okna při "
+"odhlášení, restartování a vypnutí."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Odebrat položku Odhlásit z nabídky sezení"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr "Nezobrazí tlačítko odhlášení v nabídce sezení."
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Odstranit položku Restartovat z nabídky sezení"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr "Nezobrazí tlačítko restart v nabídce sezení."
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
 msgid "Remove the shutdown item from the session menu"
 msgstr "Odstranit položku Vypnout z nabídky sezení"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr "Nezobrazí tlačítko vypnutí v nabídce sezení."
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"Potlačit dialogové okno pro potvrzení odhlášení, restartování a vypnutí"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
-"Určuje, zda se mají či nemají zobrazovat potvrzující dialogová okna při "
-"odhlášení, restartování a vypnutí."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "Klasické sezení hosta"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "Host"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "Spustí klasické sezení pro hosta"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Uzamknout obrazovku"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Vypnout"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Odhlásit"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "Nastavení systému..."
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Restartovat"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "Online účty..."
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
+
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "Přepnout uživatele..."
+
+#: ../src/service.c:575 ../src/service.c:591
+#, fuzzy
+msgid "Switch Account"
+msgstr "Přepnout uživatele..."
+
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "Přepnout uživatele..."
+
+#: ../src/service.c:588
+#, fuzzy
+msgid "Lock/Switch Account"
+msgstr "Přepnout uživatele..."
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Sezení hosta"
+
+#: ../src/service.c:696
 msgid "Log Out…"
 msgstr "Odhlásit..."
 
-#: ../src/settings-helper.c:89
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
+msgid "Log Out"
+msgstr "Odhlásit"
+
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Uspat do paměti"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Uspat na disk"
+
+#: ../src/service.c:722
 msgid "Restart…"
 msgstr "Restartovat..."
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "Restartovat"
+
+#: ../src/service.c:729
 msgid "Shut Down…"
 msgstr "Vypnout..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "Odhlášení"
-
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "Restartování"
-
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
-msgstr "Vypnutí"
+msgstr "Vypnout"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr "Opravdu chcete ukončit všechny programy a odhlásit se?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+"Některé aktualizace softwaru nebudou uplatněny do dalšího restartu počítače."
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "Zrušit"
+
+#: ../src/backend-dbus/actions.c:862
 msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr "Opravdu chcete ukončit všechny programy a restartovat počítač?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr "Opravdu chcete ukončit všechny programy a vypnout počítač?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "Odhlásit"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Restartovat"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Vypnout"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Odhlásit"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr "Restartovat..."
+#~ msgid "Classic Guest Session"
+#~ msgstr "Klasické sezení hosta"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr "Vypnout..."
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "Spustí klasické sezení pro hosta"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Radši restartovat"
+#~ msgid "Lock Screen"
+#~ msgstr "Uzamknout obrazovku"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "Místo toho restartovat..."
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Odhlášení"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr "Některé aktualizace se neprojeví až do příštího restartu počítače."
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Restartování"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "Zrušit"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Vypnutí"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "1"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Odhlásit"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr "Přepnout uživatele..."
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Restartovat"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "Přepnout z %s..."
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Vypnout"
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "Software je aktuální"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Odhlásit"
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "Jsou k dispozici aktualizace..."
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "Restartovat..."
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "Instalují se aktualizace"
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "Vypnout..."
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr "Restartovat pro dokončení aktualizace..."
+#~ msgid "Restart Instead"
+#~ msgstr "Radši restartovat"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "Nastavení systému..."
+#~ msgid "Restart Instead…"
+#~ msgstr "Místo toho restartovat..."
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "Displeje..."
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr "Některé aktualizace se neprojeví až do příštího restartu počítače."
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "Aplikace po spuštění..."
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "1"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "Připojená zařízení"
+#~ msgid "Switch From %s…"
+#~ msgstr "Přepnout z %s..."
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "Tiskárny"
+#~ msgid "Software Up to Date"
+#~ msgstr "Software je aktuální"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "Skenery"
+#~ msgid "Updates Available…"
+#~ msgstr "Jsou k dispozici aktualizace..."
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "Webkamera"
+#~ msgid "Updates Installing…"
+#~ msgstr "Instalují se aktualizace"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Uspat do paměti"
+#~ msgid "Restart to Complete Updates…"
+#~ msgstr "Restartovat pro dokončení aktualizace..."
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Uspat na disk"
+#~ msgid "Displays…"
+#~ msgstr "Displeje..."
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Sezení hosta"
+#~ msgid "Startup Applications…"
+#~ msgstr "Aplikace po spuštění..."
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "Host"
+#~ msgid "Attached Devices"
+#~ msgstr "Připojená zařízení"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "Online účty..."
+#~ msgid "Printers"
+#~ msgstr "Tiskárny"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "Uživatelské účty..."
+#~ msgid "Scanners"
+#~ msgstr "Skenery"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "%s webová kamera"
+#~ msgid "Webcam"
+#~ msgstr "Webkamera"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "Skener"
+#~ msgid "User Accounts…"
+#~ msgstr "Uživatelské účty..."
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "%s skener"
+#~ msgid "%s Webcam"
+#~ msgstr "%s webová kamera"
+
+#~ msgid "Scanner"
+#~ msgstr "Skener"
+
+#~ msgid "%s Scanner"
+#~ msgstr "%s skener"
 
 #~ msgid "Restart..."
 #~ msgstr "Restartovat..."
@@ -295,7 +330,6 @@ msgstr "%s skener"
 #~ msgid "Switch User..."
 #~ msgstr "Přepnout uživatele..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Přepnout z %s..."
 
@@ -306,10 +340,6 @@ msgstr "%s skener"
 #~ msgid "Restart..."
 #~ msgstr "Restartovat..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Některé aktualizace softwaru nebudou uplatněny do dalšího restartu počítače."
-
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
 #~ msgstr ""
 #~ "Provede se takové nastavení, že tlačítko pro odhlášení nebude zobrazeno v "
@@ -319,7 +349,8 @@ msgstr "%s skener"
 #~ msgid "Shut Down..."
 #~ msgstr "Vypnout..."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr ""
 #~ "Provede se takové nastavení, že tlačítko pro restart nebude zobrazeno v "
 #~ "nabídce sezení."
diff --git a/po/cv.po b/po/cv.po
index c9a4d42..9591935 100644
--- a/po/cv.po
+++ b/po/cv.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
 "PO-Revision-Date: 2010-03-20 09:37+0000\n"
 "Last-Translator: Ted Gould <ted@gould.cx>\n"
 "Language-Team: Chuvash <cv@li.org>\n"
+"Language: cv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,20 +19,21 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgid ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
-msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+msgid "Remove the Log Out item from the session menu"
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
-msgid "Remove the Log Out item from the session menu"
+msgid "Makes it so that the logout button doesn’t show in the session menu."
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
@@ -39,246 +41,185 @@ msgid "Remove the Restart item from the session menu"
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgid "Remove the shutdown item from the session menu"
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
-msgstr ""
-
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr ""
-
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr ""
-
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Sünter"
-
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr ""
-
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Sünterse şut"
-
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr ""
-
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr ""
-
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "Sünterse şut"
-
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
-msgstr "Sünter"
-
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/service.c:325
+msgid "Guest"
 msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
 msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
 msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
+#: ../src/service.c:346
+msgid "About This Computer"
 msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Sünterse şut"
-
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Sünter"
-
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
+#: ../src/service.c:361
+msgid "System Settings…"
 msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
+#: ../src/service.c:363
+msgid "Online Accounts…"
 msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
+#: ../src/service.c:566
+msgid "Start Screen Saver"
 msgstr ""
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
 msgstr ""
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
 msgstr ""
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
 msgstr ""
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
 msgstr ""
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
+#: ../src/service.c:594
+msgid "Lock"
 msgstr ""
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
+#: ../src/service.c:619
+msgid "Guest Session"
 msgstr ""
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
+#: ../src/service.c:696
+msgid "Log Out…"
 msgstr ""
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
+msgid "Log Out"
 msgstr ""
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
+#: ../src/service.c:714
+msgid "Suspend"
 msgstr ""
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
+#: ../src/service.c:717
+msgid "Hibernate"
 msgstr ""
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
+#: ../src/service.c:722
+msgid "Restart…"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr ""
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "Sünterse şut"
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
+#: ../src/service.c:729
+msgid "Shut Down…"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr ""
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr "Sünter"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
+#: ../src/backend-dbus/actions.c:818
+msgid "Are you sure you want to close all programs and log out?"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
+#: ../src/backend-dbus/actions.c:819
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
 msgstr ""
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Sünterse şut"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Sünter"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Sünterse şut"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Sünter"
 
 #~ msgid "Restart..."
 #~ msgstr "Sünterse şut..."
diff --git a/po/cy.po b/po/cy.po
index fbb22c1..3d99aba 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
 "PO-Revision-Date: 2011-04-01 19:12+0000\n"
 "Last-Translator: danielt998 <daniel@fearnley.net>\n"
 "Language-Team: Welsh <cy@li.org>\n"
+"Language: cy\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,270 +19,236 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr ""
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr "Atal y deialog sy'n cadarnhau allgofnodi, ailgychwyn a diffodd"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
+"P'un ai dangos y deialog sy'n cadarnhau allgofnodi, ailgychwyn a diffodd neu "
+"beidio"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Tynnu eitem Allgofnodi o'r ddewislen sesiwn"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Tynnu eitem Ailgychwyn o'r ddewislen sesiwn"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
-msgstr "Tynnu eitem Diffodd o'r ddewislen sesiwn"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
-msgstr "Atal y deialog sy'n cadarnhau allgofnodi, ailgychwyn a diffodd"
+msgid "Remove the shutdown item from the session menu"
+msgstr "Tynnu eitem Diffodd o'r ddewislen sesiwn"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
-"P'un ai dangos y deialog sy'n cadarnhau allgofnodi, ailgychwyn a diffodd neu "
-"beidio"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Cloi'r Sgrîn"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Diffodd"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Allgofnodi"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Ailgychwyn"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Allgofnodi..."
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Ailgychwyn…"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Diffodd..."
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "Allgofnodi"
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "Ailgychwyn"
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
-msgstr "Diffodd"
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
-msgstr "Wyt ti'n siwr dy fod eisiau cau pob rhaglen ac allgofnodi?"
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
+#: ../src/service.c:594
+msgid "Lock"
 msgstr ""
-"Wyt ti'n siwr dy fod eisiau cau pob rhaglen ac ailgychwyn y cyfrifiadur?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
-msgstr "Wyt ti'n siwr dy fod eisiau cau pob rhaglen a diffodd y cyfrifiadur?"
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Sesiwn Wadd"
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Allgofnodi..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Allgofnodi"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Ailgychwyn"
-
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Diffodd"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Seibio"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Allgofnodi"
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Cysgu"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
+#: ../src/service.c:722
 msgid "Restart…"
-msgstr ""
+msgstr "Ailgychwyn…"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "Ailgychwyn"
+
+#: ../src/service.c:729
 msgid "Shut Down…"
-msgstr ""
+msgstr "Diffodd..."
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Ailgychwyn yn lle"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr "Diffodd"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
+msgstr "Wyt ti'n siwr dy fod eisiau cau pob rhaglen ac allgofnodi?"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
 msgstr ""
+"Fydd rhai diweddariadau meddalwedd ddim yn weithredol tan i'r cyfrifiadur "
+"ailgychwyn."
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
 msgid "Cancel"
 msgstr "Canslo"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "1"
-
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr ""
-
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr ""
-
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr ""
-
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
+"Wyt ti'n siwr dy fod eisiau cau pob rhaglen ac ailgychwyn y cyfrifiadur?"
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr "Wyt ti'n siwr dy fod eisiau cau pob rhaglen a diffodd y cyfrifiadur?"
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr ""
+#~ msgid "Lock Screen"
+#~ msgstr "Cloi'r Sgrîn"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Allgofnodi"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Ailgychwyn"
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Diffodd"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Seibio"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Allgofnodi"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Cysgu"
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Ailgychwyn"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Sesiwn Wadd"
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Diffodd"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr ""
-
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr ""
-
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr ""
-
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr ""
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Allgofnodi"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr ""
+#~ msgid "Restart Instead"
+#~ msgstr "Ailgychwyn yn lle"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr ""
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "1"
 
 #~ msgid "Restart..."
 #~ msgstr "Ailgychwyn..."
@@ -293,7 +260,8 @@ msgstr ""
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
 #~ msgstr "Fel nad yw botwm allgofnodi yn ymddangos yn y ddewislen sesiwn"
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "Fel nad yw botwm ailgychwyn yn ymddangos yn y ddewislen sesiwn"
 
 #~ msgid ""
@@ -310,18 +278,12 @@ msgstr ""
 #~ msgid "Shut Down..."
 #~ msgstr "Diffodd..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Fydd rhai diweddariadau meddalwedd ddim yn weithredol tan i'r cyfrifiadur "
-#~ "ailgychwyn."
-
 #~ msgid "Restart Instead..."
 #~ msgstr "Ailgychwyn yn lle..."
 
 #~ msgid "Switch User..."
 #~ msgstr "Newid Defnyddiwr..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Newid o %s..."
 
diff --git a/po/da.po b/po/da.po
index f804f77..f3a066d 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
 "PO-Revision-Date: 2011-09-26 20:43+0000\n"
 "Last-Translator: Anders Feder <Unknown>\n"
 "Language-Team: Danish\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,275 +19,283 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr "Får log ud-knappen til ikke at blive vist i sessionsmenuen."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+"Vis ikke dialogboksen til bekræftelse af handlingerne logout, genstart og "
+"lukning"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr "Får genstart-knappen til ikke at blive vist i sessionsmenuen."
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
-msgstr "Får luk ned-knappen til ikke at blive vist i sessionsmenuen."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+"Angiver, om der skal vises bekræftelsesdialogbokse for handlingerne logout, "
+"genstart og lukning."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Fjern Log ud-knappen fra sessionsmenuen"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr "Får log ud-knappen til ikke at blive vist i sessionsmenuen."
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Fjern Genstart-knappen fra sessionsmenuen"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
-msgstr "Fjern Luk ned-knappen fra sessionsmenuen"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr "Får genstart-knappen til ikke at blive vist i sessionsmenuen."
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
-msgstr ""
-"Vis ikke dialogboksen til bekræftelse af handlingerne logout, genstart og "
-"lukning"
+msgid "Remove the shutdown item from the session menu"
+msgstr "Fjern Luk ned-knappen fra sessionsmenuen"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
-msgstr ""
-"Angiver, om der skal vises bekræftelsesdialogbokse for handlingerne logout, "
-"genstart og lukning."
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr "Får luk ned-knappen til ikke at blive vist i sessionsmenuen."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "Klassisk gæstesession"
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
+msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "Start en gæstesession med klassisk skrivebord"
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Lås skærm"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Luk ned"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Log af"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Genstart"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Log af..."
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "Systemindstillinger…"
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Genstart..."
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "Onlinekonti..."
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Luk ned..."
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "Log af"
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "Onlinekonti..."
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "Genstart"
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
-msgstr "Luk ned"
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "Onlinekonti..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
 msgstr ""
-"Er du sikker på, at du vil afslutte alle programmer og logge ud af denne "
-"computer?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
+#: ../src/service.c:594
+msgid "Lock"
 msgstr ""
-"Er du sikker på, at du vil afslutte alle programmer og genstarte computeren?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
-msgstr ""
-"Er du sikker på, at du vil afslutte alle programmer og lukke computeren?"
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Gæstesession"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Log af..."
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Log af"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Genstart"
-
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Luk ned"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Hvile"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Log af"
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Dvale"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
+#: ../src/service.c:722
 msgid "Restart…"
 msgstr "Genstart..."
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "Genstart"
+
+#: ../src/service.c:729
 msgid "Shut Down…"
 msgstr "Luk ned..."
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Genstart i stedet"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr "Luk ned"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "Genstart i stedet..."
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
+msgstr ""
+"Er du sikker på, at du vil afslutte alle programmer og logge ud af denne "
+"computer?"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
 msgstr ""
+"Nogle af softwareopdateringerne vil ikke gælde før computeren genstartes."
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
 msgid "Cancel"
 msgstr "Annullér"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "1"
-
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
+"Er du sikker på, at du vil afslutte alle programmer og genstarte computeren?"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
+"Er du sikker på, at du vil afslutte alle programmer og lukke computeren?"
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "Software er opdateret"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "Opdateringer tilgængelige..."
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "Systemindstillinger…"
+#~ msgid "Classic Guest Session"
+#~ msgstr "Klassisk gæstesession"
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "Skærme…"
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "Start en gæstesession med klassisk skrivebord"
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "Opstartsprogrammer..."
+#~ msgid "Lock Screen"
+#~ msgstr "Lås skærm"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "Tilsluttede enheder"
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Log af"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "Printere"
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Genstart"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "Scannere"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Luk ned"
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "Webkamera"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Log af"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Hvile"
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Genstart"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Dvale"
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Luk ned"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Gæstesession"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Log af"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr ""
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "Genstart..."
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "Onlinekonti..."
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "Luk ned..."
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr ""
+#~ msgid "Restart Instead"
+#~ msgstr "Genstart i stedet"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr ""
+#~ msgid "Restart Instead…"
+#~ msgstr "Genstart i stedet..."
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr ""
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "1"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr ""
+#~ msgid "Software Up to Date"
+#~ msgstr "Software er opdateret"
+
+#~ msgid "Updates Available…"
+#~ msgstr "Opdateringer tilgængelige..."
+
+#~ msgid "Displays…"
+#~ msgstr "Skærme…"
+
+#~ msgid "Startup Applications…"
+#~ msgstr "Opstartsprogrammer..."
+
+#~ msgid "Attached Devices"
+#~ msgstr "Tilsluttede enheder"
+
+#~ msgid "Printers"
+#~ msgstr "Printere"
+
+#~ msgid "Scanners"
+#~ msgstr "Scannere"
+
+#~ msgid "Webcam"
+#~ msgstr "Webkamera"
 
 #~ msgid "Restart..."
 #~ msgstr "Genstart..."
@@ -300,14 +309,14 @@ msgstr ""
 #~ msgid "Switch User..."
 #~ msgstr "Skift bruger..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Skift fra %s..."
 
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
 #~ msgstr "Gør så Log ud-knappen ikke findes i sessionsmenuen."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "Gør så Genstart-knappen ikke findes i sessionsmenuen."
 
 #~ msgid ""
@@ -325,10 +334,6 @@ msgstr ""
 #~ msgid "Restart..."
 #~ msgstr "Genstart..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Nogle af softwareopdateringerne vil ikke gælde før computeren genstartes."
-
 #~ msgid "Restart to Complete Update…"
 #~ msgstr "Genstart for at færdiggøre opdatering..."
 
diff --git a/po/de.po b/po/de.po
index f4185e2..43cdc9f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
 "PO-Revision-Date: 2011-09-20 15:10+0000\n"
 "Last-Translator: Hendrik Knackstedt <Unknown>\n"
 "Language-Team: German\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,278 +19,313 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr "Unterdrückt den Eintrag zum Abmelden im Sitzungsmenü."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+"Dialog unterdrücken, der die Aktionen Abmelden, Neustarten und "
+"Herunterfahren bestätigen lässt."
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr "Unterdrückt den Eintrag zum Neustarten im Sitzungsmenü."
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
-msgstr "Unterdrückt den Eintrag zum Herunterfahren im Sitzungsmenü."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+"Soll für die Aktionen Abmelden, Neustarten und Herunterfahren ein "
+"Bestätigungsfenster angezeigt werden?"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Eintrag zum Abmelden aus dem Sitzungsmenü entfernen"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr "Unterdrückt den Eintrag zum Abmelden im Sitzungsmenü."
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Eintrag zum Neustarten aus dem Sitzungsmenü entfernen"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr "Unterdrückt den Eintrag zum Neustarten im Sitzungsmenü."
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
 msgid "Remove the shutdown item from the session menu"
 msgstr "Eintrag zum Herunterfahren aus dem Sitzungsmenü entfernen"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr "Unterdrückt den Eintrag zum Herunterfahren im Sitzungsmenü."
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"Dialog unterdrücken, der die Aktionen Abmelden, Neustarten und "
-"Herunterfahren bestätigen lässt."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
-"Soll für die Aktionen Abmelden, Neustarten und Herunterfahren ein "
-"Bestätigungsfenster angezeigt werden?"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "Klassische Gastsitzung"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "Gast"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "Eine Gastsitzung in der klassischen Arbeitsumgebung starten"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Bildschirm sperren"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Herunterfahren"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Abmelden"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "Systemeinstellungen …"
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Neustarten"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "Online-Konten …"
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Abmelden …"
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Neustarten …"
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "Benutzerkonto wechseln …"
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Herunterfahren …"
+#: ../src/service.c:575 ../src/service.c:591
+#, fuzzy
+msgid "Switch Account"
+msgstr "Benutzerkonto wechseln …"
+
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "Benutzerkonto wechseln …"
+
+#: ../src/service.c:588
+#, fuzzy
+msgid "Lock/Switch Account"
+msgstr "Benutzerkonto wechseln …"
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Gastsitzung"
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Abmelden …"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Abmelden"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Bereitschaft"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Ruhezustand"
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr "Neustarten …"
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
 msgid "Restart"
 msgstr "Neustarten"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr "Herunterfahren …"
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
 msgstr "Herunterfahren"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr ""
 "Sind Sie sicher, dass Sie alle Programme schließen und sich vom Rechner "
 "abmelden wollen?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+"Einige Softwareaktualisierungen werden erst beim nächsten Neustart des "
+"Systems angewendet."
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: ../src/backend-dbus/actions.c:862
 msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
 "Sind Sie sicher, dass Sie alle Programme schließen und einen Neustart des "
 "Rechners durchführen möchten?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
 "Sind Sie sicher, dass Sie alle Programme schließen und den Rechner "
 "herunterfahren möchten?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "Abmelden"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Neustarten"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Herunterfahren"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Abmelden"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr "Neustarten …"
+#~ msgid "Classic Guest Session"
+#~ msgstr "Klassische Gastsitzung"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr "Herunterfahren …"
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "Eine Gastsitzung in der klassischen Arbeitsumgebung starten"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Stattdessen neustarten"
+#~ msgid "Lock Screen"
+#~ msgstr "Bildschirm sperren"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "Stattdessen neustarten …"
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Abmelden"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
-"Einige Aktualisierungen treten erst beim nächsten Startvorgang in Kraft."
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Neustarten"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "Abbrechen"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Herunterfahren"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "0"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Abmelden"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr "Benutzerkonto wechseln …"
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Neustarten"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "Von %s wechseln …"
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Herunterfahren"
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "Anwendungen sind aktuell"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Abmelden"
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "Aktualisierungen verfügbar …"
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "Neustarten …"
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "Aktualisierungen werden installiert …"
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "Herunterfahren …"
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr "Neustarten, um Aktualisierungen abzuschließen …"
+#~ msgid "Restart Instead"
+#~ msgstr "Stattdessen neustarten"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "Systemeinstellungen …"
+#~ msgid "Restart Instead…"
+#~ msgstr "Stattdessen neustarten …"
+
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr ""
+#~ "Einige Aktualisierungen treten erst beim nächsten Startvorgang in Kraft."
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "Anzeigegeräte …"
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "0"
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "Startprogramme …"
+#~ msgid "Switch From %s…"
+#~ msgstr "Von %s wechseln …"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "Angeschlossene Geräte"
+#~ msgid "Software Up to Date"
+#~ msgstr "Anwendungen sind aktuell"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "Drucker"
+#~ msgid "Updates Available…"
+#~ msgstr "Aktualisierungen verfügbar …"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "Scanner"
+#~ msgid "Updates Installing…"
+#~ msgstr "Aktualisierungen werden installiert …"
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "Webcam"
+#~ msgid "Restart to Complete Updates…"
+#~ msgstr "Neustarten, um Aktualisierungen abzuschließen …"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Bereitschaft"
+#~ msgid "Displays…"
+#~ msgstr "Anzeigegeräte …"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Ruhezustand"
+#~ msgid "Startup Applications…"
+#~ msgstr "Startprogramme …"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Gastsitzung"
+#~ msgid "Attached Devices"
+#~ msgstr "Angeschlossene Geräte"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "Gast"
+#~ msgid "Printers"
+#~ msgstr "Drucker"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "Online-Konten …"
+#~ msgid "Scanners"
+#~ msgstr "Scanner"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "Benutzerkonten …"
+#~ msgid "Webcam"
+#~ msgstr "Webcam"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "%s Webcam"
+#~ msgid "User Accounts…"
+#~ msgstr "Benutzerkonten …"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "Scanner"
+#~ msgid "%s Webcam"
+#~ msgstr "%s Webcam"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "%s Scanner"
+#~ msgid "Scanner"
+#~ msgstr "Scanner"
+
+#~ msgid "%s Scanner"
+#~ msgstr "%s Scanner"
 
 #~ msgid "Restart..."
 #~ msgstr "Neu starten …"
@@ -310,12 +346,6 @@ msgstr "%s Scanner"
 #~ msgid "Log Out..."
 #~ msgstr "Abmelden …"
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Einige Softwareaktualisierungen werden erst beim nächsten Neustart des "
-#~ "Systems angewendet."
-
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Wechseln von %s …"
 
@@ -343,7 +373,8 @@ msgstr "%s Scanner"
 #~ "Stellt ein, dass der Menüeintrag zum Herunterfahren des Systems nicht im "
 #~ "Sitzungsmenü angezeigt wird."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr ""
 #~ "Stellt ein, dass der Menüeintrag zum Neustarten des Systems nicht im "
 #~ "Sitzungsmenü angezeigt wird."
diff --git a/po/el.po b/po/el.po
index 35a6d50..bb863e8 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,288 +7,255 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
 "PO-Revision-Date: 2011-09-15 09:57+0000\n"
 "Last-Translator: Sebastien Bacher <seb128@ubuntu.com>\n"
 "Language-Team: Greek <team@gnome.gr>\n"
+"Language: el\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2011-09-27 15:12+0000\n"
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
 msgstr ""
+"Απόκρυψη του διαλόγου επιβεβαίωσης για τις ενέργειες αποσύνδεσης, "
+"επανεκκίνησης και τερματισμού"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
+"Αν θα εμφανίζονται ή όχι διάλογοι επιβεβαίωσης για τις ενέργειες "
+"αποσύνδεσης, επαννεκίνησης και τερματισμού."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Αφαίρεση καταχώρισης αποσύνδεσης από το μενού συνεδρίας"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Αφαίρεση της επανεκκίνησης από το μενού συνεδρίας"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
-msgstr "Αφαίρεση του τερματισμού από το μενού συνεδρίας"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
-msgstr ""
-"Απόκρυψη του διαλόγου επιβεβαίωσης για τις ενέργειες αποσύνδεσης, "
-"επανεκκίνησης και τερματισμού"
+msgid "Remove the shutdown item from the session menu"
+msgstr "Αφαίρεση του τερματισμού από το μενού συνεδρίας"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
-"Αν θα εμφανίζονται ή όχι διάλογοι επιβεβαίωσης για τις ενέργειες "
-"αποσύνδεσης, επαννεκίνησης και τερματισμού."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Κλείδωμα οθόνης"
-
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Τερματισμός"
-
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Αποσύνδεση"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Επανεκκίνηση"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Αποσύνδεση..."
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Επανεκκίνηση..."
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Τερματισμός..."
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "Αποσύνδεση"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "Επανεκκίνηση"
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
-msgstr "Τερματισμός"
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
 msgstr ""
-"Είστε βέβαιοι ότι θέλετε να κλείσετε όλα τα προγράμματα και να αποσυνδεθείτε "
-"από τον υπολογιστή;"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
 msgstr ""
-"Είστε βέβαιοι ότι θέλετε να κλείσετε όλα τα προγράμματα και να "
-"επανεκκινήσετε τον υπολογιστή;"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
 msgstr ""
-"Είστε βέβαιοι ότι θέλετε να κλείσετε όλα τα προγράμματα και να τερματίσετε "
-"τον υπολογιστή;"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "Αποσύνδεση"
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Επανεκκίνηση"
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Συνεδρία επισκέπτη"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Τερματισμός"
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Αποσύνδεση..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Αποσύνδεση"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Αναστολή"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Αδρανοποίηση"
+
+#: ../src/service.c:722
 msgid "Restart…"
-msgstr ""
+msgstr "Επανεκκίνηση..."
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "Επανεκκίνηση"
+
+#: ../src/service.c:729
 msgid "Shut Down…"
-msgstr ""
+msgstr "Τερματισμός..."
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Επανεκκίνηση αντί αποσύνδεσης"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr "Τερματισμός"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr ""
+"Είστε βέβαιοι ότι θέλετε να κλείσετε όλα τα προγράμματα και να αποσυνδεθείτε "
+"από τον υπολογιστή;"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
 msgstr ""
+"Ορισμένες ενημερώσεις λογισμικού δεν θα εφαρμοστούν μέχρι να γίνει "
+"επανεκκίνηση του υπολογιστή."
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
 msgid "Cancel"
 msgstr "Ακύρωση"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "0"
-
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr ""
-
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr ""
-
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr ""
-
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
+"Είστε βέβαιοι ότι θέλετε να κλείσετε όλα τα προγράμματα και να "
+"επανεκκινήσετε τον υπολογιστή;"
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
+"Είστε βέβαιοι ότι θέλετε να κλείσετε όλα τα προγράμματα και να τερματίσετε "
+"τον υπολογιστή;"
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr ""
+#~ msgid "Lock Screen"
+#~ msgstr "Κλείδωμα οθόνης"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Αποσύνδεση"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Επανεκκίνηση"
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Τερματισμός"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Αναστολή"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Αποσύνδεση"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Αδρανοποίηση"
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Επανεκκίνηση"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Συνεδρία επισκέπτη"
-
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr ""
-
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr ""
-
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Τερματισμός"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr ""
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Αποσύνδεση"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr ""
+#~ msgid "Restart Instead"
+#~ msgstr "Επανεκκίνηση αντί αποσύνδεσης"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr ""
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "0"
 
 #~ msgid "Restart..."
 #~ msgstr "Επανεκκίνηση..."
@@ -303,12 +270,8 @@ msgstr ""
 #~ msgstr "Αλλαγή χρήστη..."
 
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
-#~ msgstr "Ορίζει να μην εμφανίζεται το κουμπί αποσύνδεσης στο μενού συνεδρίας."
-
-#~ msgid "Some software updates won't apply until the computer next restarts."
 #~ msgstr ""
-#~ "Ορισμένες ενημερώσεις λογισμικού δεν θα εφαρμοστούν μέχρι να γίνει "
-#~ "επανεκκίνηση του υπολογιστή."
+#~ "Ορίζει να μην εμφανίζεται το κουμπί αποσύνδεσης στο μενού συνεδρίας."
 
 #~ msgid "Restart Instead..."
 #~ msgstr "Επανεκκίνηση αντί αποσύνδεσης..."
@@ -321,7 +284,8 @@ msgstr ""
 #~ msgid "Shut Down..."
 #~ msgstr "Τερματισμός..."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "Δεν θα εμφανίζεται το κουμπί επανεκκίνησης στο μενού συνεδρίας"
 
 #~ msgid ""
@@ -334,7 +298,6 @@ msgstr ""
 #~ msgid "Restart to Complete Update"
 #~ msgstr "Επανεκκίνηση για την ολοκλήρωση της ενημέρωσης"
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Εναλλαγή από %s..."
 
diff --git a/po/en_AU.po b/po/en_AU.po
index 75df404..6cf6a78 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
 "PO-Revision-Date: 2011-09-15 11:43+0000\n"
 "Last-Translator: Joel Pickett <jlkpcktt@gmail.com>\n"
 "Language-Team: English (Australia) <en_AU@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,274 +19,304 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr "Makes it so that the logout button doesn’t show in the session menu."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr "Suppress the dialog to confirm logout, restart and shutdown action"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-"Makes it so that the restart button doesn’t show in the session menu."
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Remove the Log Out item from the session menu"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr "Makes it so that the logout button doesn’t show in the session menu."
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Remove the Restart item from the session menu"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
-msgstr "Remove the shutdown item from the session menu"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr "Makes it so that the restart button doesn’t show in the session menu."
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
-msgstr "Suppress the dialog to confirm logout, restart and shutdown action"
+msgid "Remove the shutdown item from the session menu"
+msgstr "Remove the shutdown item from the session menu"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr "Makes it so that the shutdown button doesn’t show in the session menu."
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "Classic Guest Session"
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "Start a guest session using the classic desktop"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "Guest"
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Lock Screen"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Switch Off"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Log Out"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Restart"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "System Settings…"
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Log Out…"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "Online Accounts…"
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Restart…"
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Switch Off…"
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "Switch User Account…"
+
+#: ../src/service.c:575 ../src/service.c:591
+#, fuzzy
+msgid "Switch Account"
+msgstr "Switch User Account…"
+
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "Switch User Account…"
+
+#: ../src/service.c:588
+#, fuzzy
+msgid "Lock/Switch Account"
+msgstr "Switch User Account…"
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Guest Session"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Log Out…"
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Log Out"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Suspend"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Hibernate"
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr "Restart…"
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
 msgid "Restart"
 msgstr "Restart"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr "Switch Off…"
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
 msgstr "Switch Off"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr ""
 "Are you sure you want to close all programs and log out of the computer?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr "Some software updates won't apply until the computer next restarts."
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "Cancel"
+
+#: ../src/backend-dbus/actions.c:862
 msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr "Are you sure you want to close all programs and restart the computer?"
+
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr ""
+"Are you sure you want to close all programs and switch off the computer?"
+
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
-"Are you sure you want to close all programs and restart the computer?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
+#: ../src/backend-dbus/actions.c:1008
 msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
-"Are you sure you want to close all programs and switch off the computer?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "Log Out"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Restart"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Switch Off"
+#~ msgid "Classic Guest Session"
+#~ msgstr "Classic Guest Session"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Log Out"
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "Start a guest session using the classic desktop"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr "Restart…"
+#~ msgid "Lock Screen"
+#~ msgstr "Lock Screen"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr "Switch Off…"
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Log Out"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Restart Instead"
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Restart"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "Restart Instead…"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Switch Off"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr "Some software updates won’t apply until the computer next restarts."
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Log Out"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "Cancel"
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Restart"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "1"
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Switch Off"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr "Switch User Account…"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Log Out"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "Switch From %s…"
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "Restart…"
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "Software Up to Date"
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "Switch Off…"
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "Updates Available…"
+#~ msgid "Restart Instead"
+#~ msgstr "Restart Instead"
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "Updates Installing…"
+#~ msgid "Restart Instead…"
+#~ msgstr "Restart Instead…"
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr "Restart to Complete Updates…"
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr "Some software updates won’t apply until the computer next restarts."
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "System Settings…"
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "1"
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "Displays…"
+#~ msgid "Switch From %s…"
+#~ msgstr "Switch From %s…"
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "Startup Applications…"
+#~ msgid "Software Up to Date"
+#~ msgstr "Software Up to Date"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "Attached Devices"
+#~ msgid "Updates Available…"
+#~ msgstr "Updates Available…"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "Printers"
+#~ msgid "Updates Installing…"
+#~ msgstr "Updates Installing…"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "Scanners"
+#~ msgid "Restart to Complete Updates…"
+#~ msgstr "Restart to Complete Updates…"
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "Webcam"
+#~ msgid "Displays…"
+#~ msgstr "Displays…"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Suspend"
+#~ msgid "Startup Applications…"
+#~ msgstr "Startup Applications…"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Hibernate"
+#~ msgid "Attached Devices"
+#~ msgstr "Attached Devices"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Guest Session"
+#~ msgid "Printers"
+#~ msgstr "Printers"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "Guest"
+#~ msgid "Scanners"
+#~ msgstr "Scanners"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "Online Accounts…"
+#~ msgid "Webcam"
+#~ msgstr "Webcam"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "User Accounts…"
+#~ msgid "User Accounts…"
+#~ msgstr "User Accounts…"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "%s Webcam"
+#~ msgid "%s Webcam"
+#~ msgstr "%s Webcam"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "Scanner"
+#~ msgid "Scanner"
+#~ msgstr "Scanner"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "%s Scanner"
+#~ msgid "%s Scanner"
+#~ msgstr "%s Scanner"
 
 #~ msgid "Restart..."
 #~ msgstr "Restart..."
@@ -303,18 +334,15 @@ msgstr "%s Scanner"
 #~ msgid "Restart..."
 #~ msgstr "Restart..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr "Some software updates won't apply until the computer next restarts."
-
 #~ msgid "Restart Instead..."
 #~ msgstr "Restart Instead..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Switch From %s..."
 
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
-#~ msgstr "Makes it so that the logout button doesn't show in the session menu."
+#~ msgstr ""
+#~ "Makes it so that the logout button doesn't show in the session menu."
 
 #~ msgctxt "button auth"
 #~ msgid "Shut Down..."
@@ -331,7 +359,8 @@ msgstr "%s Scanner"
 #~ msgstr ""
 #~ "Makes it so that the shutdown button doesn't show in the session menu."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr ""
 #~ "Makes it so that the restart button doesn't show in the session menu."
 
diff --git a/po/en_CA.po b/po/en_CA.po
index 13b6108..25025cf 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
 "PO-Revision-Date: 2011-04-17 18:43+0000\n"
 "Last-Translator: Mark <Unknown>\n"
 "Language-Team: English (Canada) <en_CA@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,272 +19,239 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr ""
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr "Suppress the dialogue to confirm logout, restart and shutdown action"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
+"Whether or not to show confirmation dialogues for logout, restart and "
+"shutdown actions."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Remove the Log Out item from the session menu"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Remove the Restart item from the session menu"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
-msgstr "Remove the shutdown item from the session menu"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
-msgstr "Suppress the dialogue to confirm logout, restart and shutdown action"
+msgid "Remove the shutdown item from the session menu"
+msgstr "Remove the shutdown item from the session menu"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
-"Whether or not to show confirmation dialogues for logout, restart and "
-"shutdown actions."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Lock Screen"
-
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Switch Off"
-
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Log Out"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Restart"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Log Out…"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Restart…"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Switch Off…"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "Log Out"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "Restart"
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
-msgstr "Switch Off"
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
 msgstr ""
-"Are you sure you want to close all programs and log out of the computer?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
 msgstr ""
-"Are you sure you want to close all programs and restart the computer?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
 msgstr ""
-"Are you sure you want to close all programs and switch off the computer?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "Log Out"
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Restart"
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Guest Session"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Switch Off"
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Log Out…"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Log Out"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Suspend"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Hibernate"
+
+#: ../src/service.c:722
 msgid "Restart…"
-msgstr ""
+msgstr "Restart…"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "Restart"
+
+#: ../src/service.c:729
 msgid "Shut Down…"
 msgstr "Switch Off…"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Restart Instead"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr "Switch Off"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr ""
+"Are you sure you want to close all programs and log out of the computer?"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr "Some software updates won't apply until the computer next restarts."
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "1"
-
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr ""
-
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr ""
-
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr ""
-
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr "Are you sure you want to close all programs and restart the computer?"
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
+"Are you sure you want to close all programs and switch off the computer?"
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr ""
+#~ msgid "Lock Screen"
+#~ msgstr "Lock Screen"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Log Out"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Restart"
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Switch Off"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Suspend"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Log Out"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Hibernate"
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Restart"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Guest Session"
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Switch Off"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr ""
-
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr ""
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Log Out"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr ""
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "Switch Off…"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr ""
+#~ msgid "Restart Instead"
+#~ msgstr "Restart Instead"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr ""
-
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr ""
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "1"
 
 #~ msgid "Restart..."
 #~ msgstr "Restart..."
@@ -297,12 +265,12 @@ msgstr ""
 #~ msgid "Switch User..."
 #~ msgstr "Switch User..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Switch From %s..."
 
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
-#~ msgstr "Makes it so that the logout button doesn't show in the session menu."
+#~ msgstr ""
+#~ "Makes it so that the logout button doesn't show in the session menu."
 
 #~ msgctxt "button auth"
 #~ msgid "Shut Down..."
@@ -312,9 +280,6 @@ msgstr ""
 #~ msgid "Restart..."
 #~ msgstr "Restart..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr "Some software updates won't apply until the computer next restarts."
-
 #~ msgid "Restart Instead..."
 #~ msgstr "Restart Instead..."
 
@@ -323,7 +288,8 @@ msgstr ""
 #~ msgstr ""
 #~ "Makes it so that the shutdown button doesn't show in the session menu."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr ""
 #~ "Makes it so that the restart button doesn't show in the session menu."
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 2d1d125..1f67d8b 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
 "PO-Revision-Date: 2011-09-15 13:26+0000\n"
 "Last-Translator: Anthony Harrington <untaintableangel@hotmail.co.uk>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,275 +19,305 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr "Makes it so that the logout button doesn’t show in the session menu."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr "Suppress the dialogue to confirm logout, restart and shutdown action"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-"Makes it so that the restart button does not show in the session menu."
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+"Whether or not to show confirmation dialogues for logout, restart and "
+"shutdown actions."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Remove the Log Out item from the session menu"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr "Makes it so that the logout button doesn’t show in the session menu."
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Remove the Restart item from the session menu"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
-msgstr "Remove the Switch Off item from the session menu"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr "Makes it so that the restart button does not show in the session menu."
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
-msgstr "Suppress the dialogue to confirm logout, restart and shutdown action"
+msgid "Remove the shutdown item from the session menu"
+msgstr "Remove the Switch Off item from the session menu"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr "Makes it so that the shutdown button doesn’t show in the session menu."
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"Whether or not to show confirmation dialogues for logout, restart and "
-"shutdown actions."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "Classic Guest Session"
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
+
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "Guest"
+
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "Start a guest session using the classic desktop"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Lock Screen"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Switch Off"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "System Settings…"
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Log Out"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "Online Accounts…"
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Restart"
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Log Out…"
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "Switch User Account…"
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Restart…"
+#: ../src/service.c:575 ../src/service.c:591
+#, fuzzy
+msgid "Switch Account"
+msgstr "Switch User Account…"
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Switch Off…"
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "Switch User Account…"
+
+#: ../src/service.c:588
+#, fuzzy
+msgid "Lock/Switch Account"
+msgstr "Switch User Account…"
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Guest Session"
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Log Out…"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Log Out"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Suspend"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Hibernate"
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr "Restart…"
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
 msgid "Restart"
 msgstr "Restart"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr "Switch Off…"
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
 msgstr "Switch Off"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr ""
 "Are you sure you want to close all programs and log out of the computer?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr "Some software updates won't apply until the computer next restarts."
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "Cancel"
+
+#: ../src/backend-dbus/actions.c:862
 msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr "Are you sure you want to close all programs and restart the computer?"
+
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
-"Are you sure you want to close all programs and restart the computer?"
+"Are you sure you want to close all programs and switch off the computer?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1008
 msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
-"Are you sure you want to close all programs and switch off the computer?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "Log Out"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Restart"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Switch Off"
+#~ msgid "Classic Guest Session"
+#~ msgstr "Classic Guest Session"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Log Out"
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "Start a guest session using the classic desktop"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr "Restart…"
+#~ msgid "Lock Screen"
+#~ msgstr "Lock Screen"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr "Switch Off…"
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Log Out"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Restart Instead"
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Restart"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "Restart Instead…"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Switch Off"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
-"Some software updates will not apply until the computer next restarts."
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Log Out"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "Cancel"
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Restart"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "1"
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Switch Off"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr "Switch User Account…"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Log Out"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "Switch From %s…"
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "Restart…"
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "Software Up to Date"
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "Switch Off…"
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "Updates Available…"
+#~ msgid "Restart Instead"
+#~ msgstr "Restart Instead"
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "Updates Installing…"
+#~ msgid "Restart Instead…"
+#~ msgstr "Restart Instead…"
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr "Restart to Complete Updates…"
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr ""
+#~ "Some software updates will not apply until the computer next restarts."
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "System Settings…"
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "1"
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "Displays…"
+#~ msgid "Switch From %s…"
+#~ msgstr "Switch From %s…"
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "Startup Applications…"
+#~ msgid "Software Up to Date"
+#~ msgstr "Software Up to Date"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "Attached Devices"
+#~ msgid "Updates Available…"
+#~ msgstr "Updates Available…"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "Printers"
+#~ msgid "Updates Installing…"
+#~ msgstr "Updates Installing…"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "Scanners"
+#~ msgid "Restart to Complete Updates…"
+#~ msgstr "Restart to Complete Updates…"
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "Webcam"
+#~ msgid "Displays…"
+#~ msgstr "Displays…"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Suspend"
+#~ msgid "Startup Applications…"
+#~ msgstr "Startup Applications…"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Hibernate"
+#~ msgid "Attached Devices"
+#~ msgstr "Attached Devices"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Guest Session"
+#~ msgid "Printers"
+#~ msgstr "Printers"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "Guest"
+#~ msgid "Scanners"
+#~ msgstr "Scanners"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "Online Accounts…"
+#~ msgid "Webcam"
+#~ msgstr "Webcam"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "User Accounts…"
+#~ msgid "User Accounts…"
+#~ msgstr "User Accounts…"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "%s Webcam"
+#~ msgid "%s Webcam"
+#~ msgstr "%s Webcam"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "Scanner"
+#~ msgid "Scanner"
+#~ msgstr "Scanner"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "%s Scanner"
+#~ msgid "%s Scanner"
+#~ msgstr "%s Scanner"
 
 #~ msgid "Restart..."
 #~ msgstr "Restart..."
@@ -304,24 +335,22 @@ msgstr "%s Scanner"
 #~ msgid "Restart..."
 #~ msgstr "Restart..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr "Some software updates won't apply until the computer next restarts."
-
 #~ msgid "Restart Instead..."
 #~ msgstr "Restart Instead..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Switch From %s..."
 
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
-#~ msgstr "Makes it so that the logout button doesn't show in the session menu."
+#~ msgstr ""
+#~ "Makes it so that the logout button doesn't show in the session menu."
 
 #~ msgctxt "button auth"
 #~ msgid "Shut Down..."
 #~ msgstr "Shut Down..."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr ""
 #~ "Makes it so that the restart button doesn't show in the session menu."
 
diff --git a/po/eo.po b/po/eo.po
index 18e2c19..4de48a4 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
 "PO-Revision-Date: 2011-09-14 15:49+0000\n"
 "Last-Translator: Michael Moroni <michael.moroni@mailoo.org>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
+"Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,271 +19,297 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr ""
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr "Forigi la dialogon por konfirmi la elsaluton, restarton kaj elŝalton"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
+"Ĉu montri aŭ ne la dialogojn pri la konfirmo de elŝalto, restarto aŭ "
+"elsaluto."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Forigi la eron \"Elsaluti\" el la seancmenuo."
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Forigi la eron \"Restarti\" el la seancmenuo."
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
-msgstr "Forigi la eron \"Elŝalti\" el la seancmenuo."
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
-msgstr "Forigi la dialogon por konfirmi la elsaluton, restarton kaj elŝalton"
+msgid "Remove the shutdown item from the session menu"
+msgstr "Forigi la eron \"Elŝalti\" el la seancmenuo."
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
-"Ĉu montri aŭ ne la dialogojn pri la konfirmo de elŝalto, restarto aŭ "
-"elsaluto."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "Klasika gastseanco"
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
+msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "Komenci gastseancon uzante la klasikan labortablon"
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Ŝlosi ekranon"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "Gasto"
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Elŝalti"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Elsaluti"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Restarti"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Elsaluti..."
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "Sistemaj agordoj..."
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Restarti..."
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "Retkontoj..."
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Elŝalti..."
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "Elsaluti"
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "Ŝanĝi uzantkonton..."
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "Restarti"
+#: ../src/service.c:575 ../src/service.c:591
+#, fuzzy
+msgid "Switch Account"
+msgstr "Ŝanĝi uzantkonton..."
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
-msgstr "Elŝalti"
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "Ŝanĝi uzantkonton..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
-msgstr "Ĉu vi certe volas fermi ĉiujn programarojn kaj fini la seancon?"
+#: ../src/service.c:588
+#, fuzzy
+msgid "Lock/Switch Account"
+msgstr "Ŝanĝi uzantkonton..."
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
+#: ../src/service.c:594
+msgid "Lock"
 msgstr ""
-"Ĉu vi certe volas fermi ĉiujn programarojn kaj restarti la komputilon?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
-msgstr ""
-"Ĉu vi certe volas fermi ĉiujn programarojn kaj elŝalti la komputilon?"
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Gastoseanco"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Elsaluti..."
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Elsaluti"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Restarti"
-
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Elŝalti"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Paŭzigi"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Elsaluti"
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Pasivumigi"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
+#: ../src/service.c:722
 msgid "Restart…"
 msgstr "Restarti..."
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "Restarti"
+
+#: ../src/service.c:729
 msgid "Shut Down…"
 msgstr "Elŝalti..."
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Restarti anstataŭe"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr "Elŝalti"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "Restarti anstataŭe..."
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
+msgstr "Ĉu vi certe volas fermi ĉiujn programarojn kaj fini la seancon?"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
 msgstr ""
+"Kelkaj programaraj aktualigoj plenumos tiam, kiam la komputilo restartos."
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
 msgid "Cancel"
 msgstr "Nuligi"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "1"
-
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr "Ŝanĝi uzantkonton..."
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr "Ĉu vi certe volas fermi ĉiujn programarojn kaj restarti la komputilon?"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "Ŝanĝi el %s..."
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr "Ĉu vi certe volas fermi ĉiujn programarojn kaj elŝalti la komputilon?"
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "Ĝisdataj programaroj"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "Ĝisdatigoj disponeblas..."
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "Instalanta promociojn..."
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "Sistemaj agordoj..."
+#~ msgid "Classic Guest Session"
+#~ msgstr "Klasika gastseanco"
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "Ekranoj..."
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "Komenci gastseancon uzante la klasikan labortablon"
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "Startaj aplikaĵoj..."
+#~ msgid "Lock Screen"
+#~ msgstr "Ŝlosi ekranon"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "Konektitaj aparatoj"
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Elsaluti"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "Presiloj"
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Restarti"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "Skaniloj"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Elŝalti"
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "Retkamerao"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Elsaluti"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Paŭzigi"
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Restarti"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Pasivumigi"
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Elŝalti"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Gastoseanco"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Elsaluti"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "Gasto"
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "Restarti..."
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "Retkontoj..."
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "Elŝalti..."
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "Uzantkontoj..."
+#~ msgid "Restart Instead"
+#~ msgstr "Restarti anstataŭe"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "Retkamerao %s"
+#~ msgid "Restart Instead…"
+#~ msgstr "Restarti anstataŭe..."
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "Skanilo"
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "1"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "Skanilo %s"
+#~ msgid "Switch From %s…"
+#~ msgstr "Ŝanĝi el %s..."
+
+#~ msgid "Software Up to Date"
+#~ msgstr "Ĝisdataj programaroj"
+
+#~ msgid "Updates Available…"
+#~ msgstr "Ĝisdatigoj disponeblas..."
+
+#~ msgid "Updates Installing…"
+#~ msgstr "Instalanta promociojn..."
+
+#~ msgid "Displays…"
+#~ msgstr "Ekranoj..."
+
+#~ msgid "Startup Applications…"
+#~ msgstr "Startaj aplikaĵoj..."
+
+#~ msgid "Attached Devices"
+#~ msgstr "Konektitaj aparatoj"
+
+#~ msgid "Printers"
+#~ msgstr "Presiloj"
+
+#~ msgid "Scanners"
+#~ msgstr "Skaniloj"
+
+#~ msgid "Webcam"
+#~ msgstr "Retkamerao"
+
+#~ msgid "User Accounts…"
+#~ msgstr "Uzantkontoj..."
+
+#~ msgid "%s Webcam"
+#~ msgstr "Retkamerao %s"
+
+#~ msgid "Scanner"
+#~ msgstr "Skanilo"
+
+#~ msgid "%s Scanner"
+#~ msgstr "Skanilo %s"
 
 #~ msgid "Restart..."
 #~ msgstr "Restarti..."
@@ -296,7 +323,6 @@ msgstr "Skanilo %s"
 #~ msgid "Switch User..."
 #~ msgstr "Ŝanĝi uzanton..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Ŝanĝi de %s..."
 
@@ -310,7 +336,8 @@ msgstr "Skanilo %s"
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
 #~ msgstr "Faras tiel, ke la elsalutbutono ne estas montrata en la seancmenuo."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "Faras tiel, ke la restartbutono ne estas montrata en la seancmenuo."
 
 #~ msgid ""
@@ -321,10 +348,6 @@ msgstr "Skanilo %s"
 #~ msgid "Restart..."
 #~ msgstr "Restarti..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Kelkaj programaraj aktualigoj plenumos tiam, kiam la komputilo restartos."
-
 #~ msgid "Restart Instead..."
 #~ msgstr "Restarti anstataŭe..."
 
diff --git a/po/es.po b/po/es.po
index 76e73b1..ec991e9 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
 "PO-Revision-Date: 2011-09-15 11:16+0000\n"
 "Last-Translator: Fitoschido <fitoschido@gmail.com>\n"
 "Language-Team: Spanish\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,276 +19,311 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr "Hace que el botón de cerrar sesión no aparezca en el menú de sesión."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+"Suprimir la ventana de confirmación al cerrar sesión, reiniciar y apagar."
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr "Hace que el botón de reiniciar no aparezca en el menú de sesión."
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
-msgstr "Hace que el botón de apagar no aparezca en el menú de sesión."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+"Determina si se muestran o no diálogos de confirmación para cerrar sesión, "
+"reiniciar o apagar."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Quitar la opción «Cerrar sesión» del menú de sesión"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr "Hace que el botón de cerrar sesión no aparezca en el menú de sesión."
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Quitar la opción «Reiniciar» del menú de sesión"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr "Hace que el botón de reiniciar no aparezca en el menú de sesión."
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
 msgid "Remove the shutdown item from the session menu"
 msgstr "Quitar la opción «Apagar» del menú de sesión"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr "Hace que el botón de apagar no aparezca en el menú de sesión."
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"Suprimir la ventana de confirmación al cerrar sesión, reiniciar y apagar."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
-"Determina si se muestran o no diálogos de confirmación para cerrar sesión, "
-"reiniciar o apagar."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "Sesión de invitado clásica"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "Invitado"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "Iniciar una sesión de invitado usando el escritorio clásico"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Bloquear la pantalla"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Apagar"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Cerrar sesión"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "Configuración del sistema…"
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Reiniciar"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "Cuentas en línea…"
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Cerrar sesión…"
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Reiniciar…"
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "Cambiar cuenta de usuario..."
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Apagar…"
+#: ../src/service.c:575 ../src/service.c:591
+#, fuzzy
+msgid "Switch Account"
+msgstr "Cambiar cuenta de usuario..."
+
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "Cambiar cuenta de usuario..."
+
+#: ../src/service.c:588
+#, fuzzy
+msgid "Lock/Switch Account"
+msgstr "Cambiar cuenta de usuario..."
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Sesión de invitado"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Cerrar sesión…"
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Cerrar sesión"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Suspender"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Hibernar"
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr "Reiniciar…"
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
 msgid "Restart"
 msgstr "Reiniciar"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr "Apagar…"
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
 msgstr "Apagar"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr ""
 "¿Está seguro de que quiere cerrar todos los programas y finalizar su sesión "
 "en el equipo?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+"Algunas actualizaciones de software no se aplicarán hasta que el equipo se "
+"reinicie."
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: ../src/backend-dbus/actions.c:862
 msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
 "¿Está seguro de que quiere cerrar todos los programas y reiniciar el equipo?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
 "¿Está seguro de que quiere cerrar todos los programas y apagar el equipo?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "Cerrar sesión"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Reiniciar"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Apagar"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Cerrar sesión"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr "Reiniciar…"
+#~ msgid "Classic Guest Session"
+#~ msgstr "Sesión de invitado clásica"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr "Apagar…"
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "Iniciar una sesión de invitado usando el escritorio clásico"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Mejor reiniciar"
+#~ msgid "Lock Screen"
+#~ msgstr "Bloquear la pantalla"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "Mejor reiniciar…"
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Cerrar sesión"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
-"No se aplicarán algunas actualizaciones de software hasta que el equipo se "
-"reinicie."
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Reiniciar"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "Cancelar"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Apagar"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "0"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Cerrar sesión"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr "Cambiar cuenta de usuario..."
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Reiniciar"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "Cambiar desde %s…"
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Apagar"
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "Software actualizado"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Cerrar sesión"
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "Actualizaciones disponibles…"
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "Reiniciar…"
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "Actualizaciones instalándose…"
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "Apagar…"
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr "Reiniciar para completar las actualizaciones…"
+#~ msgid "Restart Instead"
+#~ msgstr "Mejor reiniciar"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "Configuración del sistema…"
+#~ msgid "Restart Instead…"
+#~ msgstr "Mejor reiniciar…"
+
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr ""
+#~ "No se aplicarán algunas actualizaciones de software hasta que el equipo "
+#~ "se reinicie."
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "Pantallas…"
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "0"
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "Aplicaciones al inicio…"
+#~ msgid "Switch From %s…"
+#~ msgstr "Cambiar desde %s…"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "Dispositivos conectados"
+#~ msgid "Software Up to Date"
+#~ msgstr "Software actualizado"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "Impresoras"
+#~ msgid "Updates Available…"
+#~ msgstr "Actualizaciones disponibles…"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "Escáneres"
+#~ msgid "Updates Installing…"
+#~ msgstr "Actualizaciones instalándose…"
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "Cámara web"
+#~ msgid "Restart to Complete Updates…"
+#~ msgstr "Reiniciar para completar las actualizaciones…"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Suspender"
+#~ msgid "Displays…"
+#~ msgstr "Pantallas…"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Hibernar"
+#~ msgid "Startup Applications…"
+#~ msgstr "Aplicaciones al inicio…"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Sesión de invitado"
+#~ msgid "Attached Devices"
+#~ msgstr "Dispositivos conectados"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "Invitado"
+#~ msgid "Printers"
+#~ msgstr "Impresoras"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "Cuentas en línea…"
+#~ msgid "Scanners"
+#~ msgstr "Escáneres"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "Cuentas de usuario…"
+#~ msgid "Webcam"
+#~ msgstr "Cámara web"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "Cámara web %s"
+#~ msgid "User Accounts…"
+#~ msgstr "Cuentas de usuario…"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "Escáner"
+#~ msgid "%s Webcam"
+#~ msgstr "Cámara web %s"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "Escáner %s"
+#~ msgid "Scanner"
+#~ msgstr "Escáner"
+
+#~ msgid "%s Scanner"
+#~ msgstr "Escáner %s"
 
 #~ msgid "Restart..."
 #~ msgstr "Reiniciar..."
@@ -305,15 +341,9 @@ msgstr "Escáner %s"
 #~ msgid "Restart..."
 #~ msgstr "Reiniciar..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Algunas actualizaciones de software no se aplicarán hasta que el equipo se "
-#~ "reinicie."
-
 #~ msgid "Restart Instead..."
 #~ msgstr "Mejor reiniciar..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Cambiar desde %s..."
 
@@ -325,7 +355,8 @@ msgstr "Escáner %s"
 #~ msgid "Shut Down..."
 #~ msgstr "Apagar..."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "Hace que el botón de reinicio no se muestre en el menú de sesión."
 
 #~ msgid ""
diff --git a/po/et.po b/po/et.po
index 4cba1ff..b581b73 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
 "PO-Revision-Date: 2011-09-16 04:04+0000\n"
 "Last-Translator: tabbernuk <boamaod@gmail.com>\n"
 "Language-Team: Estonian <et@li.org>\n"
+"Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,274 +19,307 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr "Teeb nii, et väljalogimise nuppu sessioonimenüüs ei näidata."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+"Taaskäivituse, väljalogimise ja väljalülitamise kinnitusdialoogi ei näidata"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr "Teeb nii, et taaskäivitamise nuppu sessioonimenüüs ei näidata."
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
-msgstr "Teeb nii, et väljalülitamise nuppu sessioonimenüüs ei näidata."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+"Kas näidata kinnitusdialoogi taaskäivitusel, väljalogimisel ja "
+"väljalülitamisel või mitte."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Väljalogimise nupu eemaldamine sessioonimenüüst"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr "Teeb nii, et väljalogimise nuppu sessioonimenüüs ei näidata."
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Taaskäivituse nupu eemaldamine sessioonimenüüst"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr "Teeb nii, et taaskäivitamise nuppu sessioonimenüüs ei näidata."
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
 msgid "Remove the shutdown item from the session menu"
 msgstr "Väljalülitamise nupu eemaldamine sessioonimenüüst"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr "Teeb nii, et väljalülitamise nuppu sessioonimenüüs ei näidata."
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"Taaskäivituse, väljalogimise ja väljalülitamise kinnitusdialoogi ei näidata"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
-"Kas näidata kinnitusdialoogi taaskäivitusel, väljalogimisel ja "
-"väljalülitamisel või mitte."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "Klassikaline külalissessioon"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "Külaline"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "Külalissessiooni alustamine klassikalise töölauaga"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Lukusta ekraan"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Lülita välja"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Logi välja"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "Süsteemi seadistamine..."
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Taaskäivita"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "Netikontod..."
+
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
+
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "Lülitu kasutajale..."
+
+#: ../src/service.c:575 ../src/service.c:591
+#, fuzzy
+msgid "Switch Account"
+msgstr "Lülitu kasutajale..."
+
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "Lülitu kasutajale..."
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
+#: ../src/service.c:588
+#, fuzzy
+msgid "Lock/Switch Account"
+msgstr "Lülitu kasutajale..."
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Külalissessioon"
+
+#: ../src/service.c:696
 msgid "Log Out…"
 msgstr "Logi välja..."
 
-#: ../src/settings-helper.c:89
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
+msgid "Log Out"
+msgstr "Logi välja"
+
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Uinak"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Talveuni"
+
+#: ../src/service.c:722
 msgid "Restart…"
 msgstr "Taaskäivita..."
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "Taaskäivita"
+
+#: ../src/service.c:729
 msgid "Shut Down…"
 msgstr "Lülita välja..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "Väljalogimine"
-
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "Taaskäivitamine"
-
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
-msgstr "Väljalülitamine"
+msgstr "Lülita välja"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr ""
 "Kas oled kindel, et tahad kõik programmid sulgeda ja arvutist välja logida?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr "Mõned tarkvarauuendused ei rakendu enne arvuti taaskäivitust."
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "Loobu"
+
+#: ../src/backend-dbus/actions.c:862
 msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
 "Kas oled kindel, et tahad kõik programmid sulgeda ja arvuti taaskäivitada?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
 "Kas oled kindel, et tahad kõik programmid sulgeda ja arvuti välja lülitada?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "Logi välja"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Taaskäivita"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Lülita välja"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Logi välja"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr "Taaskäivita..."
+#~ msgid "Classic Guest Session"
+#~ msgstr "Klassikaline külalissessioon"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr "Lülita välja..."
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "Külalissessiooni alustamine klassikalise töölauaga"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Tee hoopis taaskäivitus"
+#~ msgid "Lock Screen"
+#~ msgstr "Lukusta ekraan"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "Taaskäivita selle asemel, et..."
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Väljalogimine"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
-"Mõned tarkvarauuendused ei rakendu enne, kui arvutile tehakse algkäivitus."
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Taaskäivitamine"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "Loobu"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Väljalülitamine"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "0"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Logi välja"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr "Lülitu kasutajale..."
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Taaskäivita"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "Lülitu kasutajalt %s..."
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Lülita välja"
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "Tarkvara uuendamine..."
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Logi välja"
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "Uuendused saadaval..."
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "Taaskäivita..."
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "Uuenduste paigaldamine..."
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "Lülita välja..."
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr "Taaskäivita uuendamise lõpetamiseks..."
+#~ msgid "Restart Instead"
+#~ msgstr "Tee hoopis taaskäivitus"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "Süsteemi seadistamine..."
+#~ msgid "Restart Instead…"
+#~ msgstr "Taaskäivita selle asemel, et..."
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "Kuvarid..."
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr ""
+#~ "Mõned tarkvarauuendused ei rakendu enne, kui arvutile tehakse algkäivitus."
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "Isekäivituvad rakendused..."
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "0"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "Ühendatud seadmed"
+#~ msgid "Switch From %s…"
+#~ msgstr "Lülitu kasutajalt %s..."
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "Printerid"
+#~ msgid "Software Up to Date"
+#~ msgstr "Tarkvara uuendamine..."
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "Skännerid"
+#~ msgid "Updates Available…"
+#~ msgstr "Uuendused saadaval..."
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "Veebikaamera"
+#~ msgid "Updates Installing…"
+#~ msgstr "Uuenduste paigaldamine..."
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Uinak"
+#~ msgid "Restart to Complete Updates…"
+#~ msgstr "Taaskäivita uuendamise lõpetamiseks..."
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Talveuni"
+#~ msgid "Displays…"
+#~ msgstr "Kuvarid..."
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Külalissessioon"
+#~ msgid "Startup Applications…"
+#~ msgstr "Isekäivituvad rakendused..."
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "Külaline"
+#~ msgid "Attached Devices"
+#~ msgstr "Ühendatud seadmed"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "Netikontod..."
+#~ msgid "Printers"
+#~ msgstr "Printerid"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "Kasutajakontod..."
+#~ msgid "Scanners"
+#~ msgstr "Skännerid"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "%s veebikaamera"
+#~ msgid "Webcam"
+#~ msgstr "Veebikaamera"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "Skänner"
+#~ msgid "User Accounts…"
+#~ msgstr "Kasutajakontod..."
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "%s skänner"
+#~ msgid "%s Webcam"
+#~ msgstr "%s veebikaamera"
+
+#~ msgid "Scanner"
+#~ msgstr "Skänner"
+
+#~ msgid "%s Scanner"
+#~ msgstr "%s skänner"
 
 #~ msgid "Shut Down..."
 #~ msgstr "Lülita välja..."
@@ -303,13 +337,9 @@ msgstr "%s skänner"
 #~ msgid "Restart..."
 #~ msgstr "Taaskäivita..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr "Mõned tarkvarauuendused ei rakendu enne arvuti taaskäivitust."
-
 #~ msgid "Restart Instead..."
 #~ msgstr "Tee hoopis taaskäivitus..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Vahetada %s..."
 
@@ -329,7 +359,8 @@ msgstr "%s skänner"
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
 #~ msgstr "Väljalogimise nuppu ei näidata sessioonimenüüs."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "Taaskäivituse nuppu ei näidata sessioonimenüüs."
 
 #~ msgid ""
diff --git a/po/eu.po b/po/eu.po
index 1299443..7744c21 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
 "PO-Revision-Date: 2011-09-15 10:49+0000\n"
 "Last-Translator: Oier Mees <Unknown>\n"
 "Language-Team: Basque <eu@li.org>\n"
+"Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,274 +19,308 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr "Ez erakutsi saioa amaitzeko  botoia saioaren menuan."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+"Ez konfirmazio-leihorik erakutsi saioa amaitzeko, berrabiarazteko edo "
+"itzaltzeko."
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr "Ez erakutsi berrabiarazteko botoia saioaren menuan."
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
-msgstr "Ez erakutsi itzali botoia saioaren menuan."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+"Konfirmazio-leihorik erakutsiko den saioa amaitzeko, berrabiarazteko edo "
+"itzaltzeko."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Kendu 'Amaitu saioa...' aukera saioaren menutik"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr "Ez erakutsi saioa amaitzeko  botoia saioaren menuan."
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Kendu 'Berrabiarazi...' aukera saioaren menutik"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr "Ez erakutsi berrabiarazteko botoia saioaren menuan."
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
 msgid "Remove the shutdown item from the session menu"
 msgstr "Kendu 'Itzali...' aukera saioaren menutik"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr "Ez erakutsi itzali botoia saioaren menuan."
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"Ez konfirmazio-leihorik erakutsi saioa amaitzeko, berrabiarazteko edo "
-"itzaltzeko."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
-"Konfirmazio-leihorik erakutsiko den saioa amaitzeko, berrabiarazteko edo "
-"itzaltzeko."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "Gonbidatu saio klasikoa"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "Gonbidatua"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "Hasi gonbidatu saioa mahaigain klasikoa erabiliz"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Blokeatu pantaila"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Itzali"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Amaitu saioa"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "Sistema ezarpenak..."
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Berrabiarazi"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "Lineako kontuak..."
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Amaitu saioa..."
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Berrabiarazi..."
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "Aldatu erabiltzaile kontua..."
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Itzali..."
+#: ../src/service.c:575 ../src/service.c:591
+#, fuzzy
+msgid "Switch Account"
+msgstr "Aldatu erabiltzaile kontua..."
+
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "Aldatu erabiltzaile kontua..."
+
+#: ../src/service.c:588
+#, fuzzy
+msgid "Lock/Switch Account"
+msgstr "Aldatu erabiltzaile kontua..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Gonbidatu-saioa"
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Amaitu saioa..."
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Amaitu saioa"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Eseki"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Hibernatu"
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr "Berrabiarazi..."
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
 msgid "Restart"
 msgstr "Berrabiarazi"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr "Itzali..."
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
 msgstr "Itzali"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr "Ziur programa guztiak itxi eta saioa amaitu nahi duzula?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+"Software eguneraketa batzuk ez dira aplikatuko ordenagailua berrabiarazi "
+"arte."
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "Utzi"
+
+#: ../src/backend-dbus/actions.c:862
 msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr "Ziur programa guztiak itxi eta ordenagailua berrabiarazi nahi duzula?"
+
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr "Ziur programa guztiak itxi eta ordenagailua itzali nahi duzula?"
+
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
-"Ziur programa guztiak itxi eta ordenagailua berrabiarazi nahi duzula?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
+#: ../src/backend-dbus/actions.c:1008
 msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
-msgstr "Ziur programa guztiak itxi eta ordenagailua itzali nahi duzula?"
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "Amaitu saioa"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Berrabiarazi"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Itzali"
+#~ msgid "Classic Guest Session"
+#~ msgstr "Gonbidatu saio klasikoa"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Amaitu saioa"
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "Hasi gonbidatu saioa mahaigain klasikoa erabiliz"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr "Berrabiarazi..."
+#~ msgid "Lock Screen"
+#~ msgstr "Blokeatu pantaila"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr "Itzali..."
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Amaitu saioa"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Hobe berrabiaraztea"
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Berrabiarazi"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "Berrabiarazi..."
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Itzali"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
-"Software eguneraketa batzuk ez dira aplikatuko ordenagailua berrabiarazi "
-"arte."
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Amaitu saioa"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "Utzi"
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Berrabiarazi"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "0"
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Itzali"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr "Aldatu erabiltzaile kontua..."
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Amaitu saioa"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "%s-etik aldatu..."
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "Berrabiarazi..."
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "Softwarea eguneraturik dago"
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "Itzali..."
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "Eguneraketak eskuragarri..."
+#~ msgid "Restart Instead"
+#~ msgstr "Hobe berrabiaraztea"
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "Eguneraketak instalatzen..."
+#~ msgid "Restart Instead…"
+#~ msgstr "Berrabiarazi..."
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr "Berrabiarazi eguneraketak osatzeko..."
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr ""
+#~ "Software eguneraketa batzuk ez dira aplikatuko ordenagailua berrabiarazi "
+#~ "arte."
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "Sistema ezarpenak..."
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "0"
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "Pantailak..."
+#~ msgid "Switch From %s…"
+#~ msgstr "%s-etik aldatu..."
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "Abioko aplikazioak"
+#~ msgid "Software Up to Date"
+#~ msgstr "Softwarea eguneraturik dago"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "Konektatutako gailuak"
+#~ msgid "Updates Available…"
+#~ msgstr "Eguneraketak eskuragarri..."
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "Inprimagailuak"
+#~ msgid "Updates Installing…"
+#~ msgstr "Eguneraketak instalatzen..."
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "Eskanerrak"
+#~ msgid "Restart to Complete Updates…"
+#~ msgstr "Berrabiarazi eguneraketak osatzeko..."
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "Web kamera"
+#~ msgid "Displays…"
+#~ msgstr "Pantailak..."
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Eseki"
+#~ msgid "Startup Applications…"
+#~ msgstr "Abioko aplikazioak"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Hibernatu"
+#~ msgid "Attached Devices"
+#~ msgstr "Konektatutako gailuak"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Gonbidatu-saioa"
+#~ msgid "Printers"
+#~ msgstr "Inprimagailuak"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "Gonbidatua"
+#~ msgid "Scanners"
+#~ msgstr "Eskanerrak"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "Lineako kontuak..."
+#~ msgid "Webcam"
+#~ msgstr "Web kamera"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "Erabiltzaile-kontuak..."
+#~ msgid "User Accounts…"
+#~ msgstr "Erabiltzaile-kontuak..."
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "%s webcam-a"
+#~ msgid "%s Webcam"
+#~ msgstr "%s webcam-a"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "Eskanerra"
+#~ msgid "Scanner"
+#~ msgstr "Eskanerra"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "%s eskanerra"
+#~ msgid "%s Scanner"
+#~ msgstr "%s eskanerra"
 
 #~ msgid "Restart..."
 #~ msgstr "Berrabiarazi..."
@@ -301,15 +336,9 @@ msgstr "%s eskanerra"
 #~ msgid "Restart..."
 #~ msgstr "Berrabiarazi..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "%s(e)tik aldatu..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Software eguneraketa batzuk ez dira aplikatuko ordenagailua berrabiarazi "
-#~ "arte."
-
 #~ msgid "Restart Instead..."
 #~ msgstr "Hobe berrabiaraztea..."
 
@@ -317,14 +346,16 @@ msgstr "%s eskanerra"
 #~ msgstr ""
 #~ "Markatuta badago, saioaren menuan ez da saioa amaitzeko botoia erakutsiko."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr ""
 #~ "Markatuta badago, saioaren menuan ez da berrabiarazteko botoia erakutsiko."
 
 #~ msgid ""
 #~ "Makes it so that the shutdown button doesn't show in the session menu."
 #~ msgstr ""
-#~ "Markatuta badago, saioaren menuan ez da sistema itzaltzeko botoia erakutsiko."
+#~ "Markatuta badago, saioaren menuan ez da sistema itzaltzeko botoia "
+#~ "erakutsiko."
 
 #~ msgid "Restart to Complete Update"
 #~ msgstr "Berrabiarazi eguneraketa osatzeko"
diff --git a/po/fa.po b/po/fa.po
index b52af26..d59be27 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
 "PO-Revision-Date: 2010-03-04 17:30+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Persian <fa@li.org>\n"
+"Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,20 +19,21 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgid ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
-msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+msgid "Remove the Log Out item from the session menu"
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
-msgid "Remove the Log Out item from the session menu"
+msgid "Makes it so that the logout button doesn’t show in the session menu."
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
@@ -39,243 +41,166 @@ msgid "Remove the Restart item from the session menu"
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgid "Remove the shutdown item from the session menu"
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
-msgstr ""
-
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr ""
-
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
+#: ../src/service.c:325
+msgid "Guest"
 msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
 msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
 msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
+#: ../src/service.c:346
+msgid "About This Computer"
 msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
+#: ../src/service.c:361
+msgid "System Settings…"
 msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
+#: ../src/service.c:363
+msgid "Online Accounts…"
 msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
+#: ../src/service.c:566
+msgid "Start Screen Saver"
 msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
 msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
 msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
 msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
 msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
+#: ../src/service.c:594
+msgid "Lock"
 msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
+#: ../src/service.c:619
+msgid "Guest Session"
 msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
+#: ../src/service.c:696
+msgid "Log Out…"
 msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr ""
-
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr ""
-
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr ""
-
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr ""
-
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
-
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr ""
-
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr ""
-
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr ""
-
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr ""
-
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr ""
-
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr ""
-
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr ""
-
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr ""
-
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr ""
-
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
+#: ../src/service.c:714
+msgid "Suspend"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
+#: ../src/service.c:717
+msgid "Hibernate"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
+#: ../src/service.c:722
+msgid "Restart…"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
+#: ../src/service.c:729
+msgid "Shut Down…"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
+#: ../src/backend-dbus/actions.c:818
+msgid "Are you sure you want to close all programs and log out?"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
+#: ../src/backend-dbus/actions.c:819
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
 msgstr ""
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
 msgstr ""
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index c244991..b8fead4 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
 "PO-Revision-Date: 2011-09-24 20:27+0000\n"
 "Last-Translator: Aleksi Kinnunen <Unknown>\n"
 "Language-Team: Finnish\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,275 +19,310 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr "Piilottaa Kirjaudu ulos -valinnan istuntovalikosta."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+"Poista uloskirjauksen, uudelleenkäynnistyksen ja sammuttamisen valintaikkuna "
+"käytöstä"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr "Piilottaa Käynnistä uudelleen -valinnan istuntovalikosta."
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
-msgstr "Piilottaa Sammuta-valinnan istuntovalikosta."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+"Valitse, näytetäänkö uudelleenkäynnistyksestä, sammuttamisesta ja "
+"uloskirjauksesta vahvistus."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Piilota Kirjaudu ulos -valinta istuntovalikosta"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr "Piilottaa Kirjaudu ulos -valinnan istuntovalikosta."
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Piilota Käynnistä uudelleen -valinta istuntovalikosta"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr "Piilottaa Käynnistä uudelleen -valinnan istuntovalikosta."
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
 msgid "Remove the shutdown item from the session menu"
 msgstr "Piilota Sammuta-valinta istuntovalikosta"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr "Piilottaa Sammuta-valinnan istuntovalikosta."
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"Poista uloskirjauksen, uudelleenkäynnistyksen ja sammuttamisen valintaikkuna "
-"käytöstä"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
-"Valitse, näytetäänkö uudelleenkäynnistyksestä, sammuttamisesta ja "
-"uloskirjauksesta vahvistus."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "Perinteinen vierasistunto"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "Vieras"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "Käynnistä vierasistunto käyttäen perinteistä työpöytää"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Lukitse näyttö"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Sammuta"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Kirjaudu ulos"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "Järjestelmäasetukset..."
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Käynnistä uudelleen"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "Verkkotilit..."
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Kirjaudu ulos..."
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Käynnistä uudelleen..."
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "Vaihda käyttäjää..."
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Sammuta..."
+#: ../src/service.c:575 ../src/service.c:591
+#, fuzzy
+msgid "Switch Account"
+msgstr "Vaihda käyttäjää..."
+
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "Vaihda käyttäjää..."
+
+#: ../src/service.c:588
+#, fuzzy
+msgid "Lock/Switch Account"
+msgstr "Vaihda käyttäjää..."
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Vierasistunto"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Kirjaudu ulos..."
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Kirjaudu ulos"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Valmiustila"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Lepotila"
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr "Käynnistä uudelleen..."
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
 msgid "Restart"
 msgstr "Käynnistä uudelleen"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr "Sammuta..."
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
 msgstr "Sammuta"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr ""
 "Haluatko todella sulkea kaikki ohjelmat ja kirjautua ulos tietokoneelta?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+"Jotkin ohjelmapäivitykset eivät tule käyttöön ennen tietokoneen uudelleen "
+"käynnistämistä."
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "Peru"
+
+#: ../src/backend-dbus/actions.c:862
 msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
 "Haluatko todella sulkea kaikki ohjelmat ja käynnistää tietokoneen uudelleen?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr "Haluatko todella sulkea kaikki ohjelmat ja sammuttaa tietokoneen?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "Kirjaudu ulos"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Käynnistä uudelleen"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Sammuta"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Kirjaudu ulos"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr "Käynnistä uudelleen..."
+#~ msgid "Classic Guest Session"
+#~ msgstr "Perinteinen vierasistunto"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr "Sammuta..."
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "Käynnistä vierasistunto käyttäen perinteistä työpöytää"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Käynnistä sen sijaan uudelleen"
+#~ msgid "Lock Screen"
+#~ msgstr "Lukitse näyttö"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "Käynnistä sen sijaan uudelleen..."
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Kirjaudu ulos"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
-"Jotkin ohjelmistopäivitykset eivät tule voimaan ennen tietokoneen "
-"uudelleenkäynnistystä."
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Käynnistä uudelleen"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "Peru"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Sammuta"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "0"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Kirjaudu ulos"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr "Vaihda käyttäjää..."
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Käynnistä uudelleen"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "Vaihda käyttäjää (nykyinen %s)…"
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Sammuta"
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "Järjestelmä on ajan tasalla"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Kirjaudu ulos"
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "Päivityksiä saatavilla..."
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "Käynnistä uudelleen..."
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "Päivityksiä asennetaan..."
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "Sammuta..."
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr "Viimeistele päivitykset uudelleenkäynnistyksellä..."
+#~ msgid "Restart Instead"
+#~ msgstr "Käynnistä sen sijaan uudelleen"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "Järjestelmäasetukset..."
+#~ msgid "Restart Instead…"
+#~ msgstr "Käynnistä sen sijaan uudelleen..."
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "Näytöt..."
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr ""
+#~ "Jotkin ohjelmistopäivitykset eivät tule voimaan ennen tietokoneen "
+#~ "uudelleenkäynnistystä."
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "Käynnistettävät sovellukset..."
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "0"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "Liitetyt laitteet"
+#~ msgid "Switch From %s…"
+#~ msgstr "Vaihda käyttäjää (nykyinen %s)…"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "Tulostimet"
+#~ msgid "Software Up to Date"
+#~ msgstr "Järjestelmä on ajan tasalla"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "Kuvanlukijat"
+#~ msgid "Updates Available…"
+#~ msgstr "Päivityksiä saatavilla..."
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "Web-kamera"
+#~ msgid "Updates Installing…"
+#~ msgstr "Päivityksiä asennetaan..."
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Valmiustila"
+#~ msgid "Restart to Complete Updates…"
+#~ msgstr "Viimeistele päivitykset uudelleenkäynnistyksellä..."
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Lepotila"
+#~ msgid "Displays…"
+#~ msgstr "Näytöt..."
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Vierasistunto"
+#~ msgid "Startup Applications…"
+#~ msgstr "Käynnistettävät sovellukset..."
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "Vieras"
+#~ msgid "Attached Devices"
+#~ msgstr "Liitetyt laitteet"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "Verkkotilit..."
+#~ msgid "Printers"
+#~ msgstr "Tulostimet"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "Käyttäjätilit..."
+#~ msgid "Scanners"
+#~ msgstr "Kuvanlukijat"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "%s-web-kamera"
+#~ msgid "Webcam"
+#~ msgstr "Web-kamera"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "Kuvanlukija"
+#~ msgid "User Accounts…"
+#~ msgstr "Käyttäjätilit..."
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "%s-kuvanlukija"
+#~ msgid "%s Webcam"
+#~ msgstr "%s-web-kamera"
+
+#~ msgid "Scanner"
+#~ msgstr "Kuvanlukija"
+
+#~ msgid "%s Scanner"
+#~ msgstr "%s-kuvanlukija"
 
 #~ msgid "Restart..."
 #~ msgstr "Käynnistä uudelleen..."
@@ -304,15 +340,9 @@ msgstr "%s-kuvanlukija"
 #~ msgid "Restart..."
 #~ msgstr "Käynnistä uudelleen..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Jotkin ohjelmapäivitykset eivät tule käyttöön ennen tietokoneen uudelleen "
-#~ "käynnistämistä."
-
 #~ msgid "Restart Instead..."
 #~ msgstr "Käynnistä sen sijaan uudelleen..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Vaihda käyttäjää %s..."
 
@@ -323,7 +353,8 @@ msgstr "%s-kuvanlukija"
 #~ msgid "Shut Down..."
 #~ msgstr "Sammuta..."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "Piilottaa uudelleenkäynnistysvalinnan istuntovalikosta."
 
 #~ msgid ""
diff --git a/po/fil.po b/po/fil.po
new file mode 100644
index 0000000..cacd9ca
--- /dev/null
+++ b/po/fil.po
@@ -0,0 +1,204 @@
+# Filipino translations for PACKAGE package.
+# Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
+"PO-Revision-Date: 2017-07-21 15:41+0200\n"
+"Last-Translator: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n"
+"Language-Team: Filipino\n"
+"Language: fil\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
+msgid ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
+msgid "Remove the Log Out item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
+msgid "Remove the Restart item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
+msgid "Remove the shutdown item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr ""
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
+msgstr ""
+
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
+
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
+
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
+
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
+
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
+
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
+
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
+
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
+
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
+
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
+
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
+
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
+msgstr ""
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr ""
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr ""
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
+msgid "Log Out"
+msgstr ""
+
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr ""
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr ""
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr ""
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr ""
+
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr ""
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:818
+msgid "Are you sure you want to close all programs and log out?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:819
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
diff --git a/po/fo.po b/po/fo.po
new file mode 100644
index 0000000..ec77639
--- /dev/null
+++ b/po/fo.po
@@ -0,0 +1,205 @@
+# Faroese translations for PACKAGE package.
+# Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
+"PO-Revision-Date: 2017-07-21 15:41+0200\n"
+"Last-Translator: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n"
+"Language-Team: Faroese\n"
+"Language: fo\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
+msgid ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
+msgid "Remove the Log Out item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
+msgid "Remove the Restart item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
+msgid "Remove the shutdown item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr ""
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
+msgstr ""
+
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
+
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
+
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
+
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
+
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
+
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
+
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
+
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
+
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
+
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
+
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
+
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
+msgstr ""
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr ""
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr ""
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
+msgid "Log Out"
+msgstr ""
+
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr ""
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr ""
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr ""
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr ""
+
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr ""
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:818
+msgid "Are you sure you want to close all programs and log out?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:819
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
diff --git a/po/fr.po b/po/fr.po
index d6d1215..639165a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
 "PO-Revision-Date: 2011-09-24 08:42+0000\n"
 "Last-Translator: Emmanuel Sunyer <emmanuel.sunyer@gmail.com>\n"
 "Language-Team: French\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,282 +19,316 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
 msgstr ""
-"Fait en sorte que le bouton de déconnexion ne soit pas affiché pas dans le "
-"menu de la session."
+"Supprimer la demande de confirmation lors d'une déconnexion, d'un "
+"redémarrage ou d'un arrêt"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-"Fait en sorte que le bouton de redémarrage ne soit pas affiché pas dans le "
-"menu de la session."
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
-"Fait en sorte que le bouton d'extinction ne soit pas affiché pas dans le "
-"menu de la session."
+"Afficher ou non les demandes de confirmation lors d'une déconnexion, d'un "
+"redémarrage ou d'un arrêt."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Supprimer l'option de fermeture de session du menu"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+"Fait en sorte que le bouton de déconnexion ne soit pas affiché pas dans le "
+"menu de la session."
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Supprimer l'option de redémarrage du menu"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
+"Fait en sorte que le bouton de redémarrage ne soit pas affiché pas dans le "
+"menu de la session."
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
 msgid "Remove the shutdown item from the session menu"
 msgstr "Supprimer l'option d'arrêt du menu"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
-"Supprimer la demande de confirmation lors d'une déconnexion, d'un "
-"redémarrage ou d'un arrêt"
+"Fait en sorte que le bouton d'extinction ne soit pas affiché pas dans le "
+"menu de la session."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"Afficher ou non les demandes de confirmation lors d'une déconnexion, d'un "
-"redémarrage ou d'un arrêt."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "Session d'invité classique"
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "Démarrer une session d'invité en utilisant le bureau classique"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "Invité"
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Verrouiller l'écran"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Éteindre"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Se déconnecter"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Redémarrer"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "Paramètres système…"
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Se déconnecter..."
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "Comptes en ligne..."
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Redémarrer..."
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Éteindre..."
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "Changer de compte utilisateur..."
+
+#: ../src/service.c:575 ../src/service.c:591
+#, fuzzy
+msgid "Switch Account"
+msgstr "Changer de compte utilisateur..."
+
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "Changer de compte utilisateur..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
+#: ../src/service.c:588
+#, fuzzy
+msgid "Lock/Switch Account"
+msgstr "Changer de compte utilisateur..."
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Session d'invité"
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Se déconnecter..."
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Se déconnecter"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Mettre en veille"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Hiberner"
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr "Redémarrer..."
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
 msgid "Restart"
 msgstr "Redémarrer"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr "Éteindre..."
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
 msgstr "Éteindre"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
+msgstr "Voulez-vous vraiment quitter tous les programmes et vous déconnecter ?"
+
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
 msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+"Some software updates won't be applied until the computer next restarts."
 msgstr ""
-"Voulez-vous vraiment quitter tous les programmes et vous déconnecter ?"
+"Certaines mises à jour logicielles ne seront effectives qu'après un "
+"redémarrage de l'ordinateur."
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "Annuler"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
+#: ../src/backend-dbus/actions.c:862
 msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
 "Voulez-vous vraiment quitter tous les programmes et redémarrer l'ordinateur ?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
 "Voulez-vous vraiment quitter tous les programmes et éteindre l'ordinateur ?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "Se déconnecter"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Redémarrer"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Éteindre"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Se déconnecter"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr "Redémarrer…"
+#~ msgid "Classic Guest Session"
+#~ msgstr "Session d'invité classique"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr "Éteindre…"
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "Démarrer une session d'invité en utilisant le bureau classique"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Redémarrer pour achever les mises à jour"
+#~ msgid "Lock Screen"
+#~ msgstr "Verrouiller l'écran"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "Redémarrer pour achever les mises à jour..."
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Se déconnecter"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
-"Certaines mises à jour logicielles ne s'appliqueront pas tant que "
-"l'ordinateur n'aura pas redémarré."
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Redémarrer"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "Annuler"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Éteindre"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "0"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Se déconnecter"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr "Changer de compte utilisateur..."
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Redémarrer"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "Changer depuis %s…"
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Éteindre"
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "Système à jour"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Se déconnecter"
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "Mises à jour disponibles..."
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "Redémarrer…"
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "Mises à jour en cours d'installation..."
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "Éteindre…"
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr "Redémarrer pour achever les mises à jour..."
+#~ msgid "Restart Instead"
+#~ msgstr "Redémarrer pour achever les mises à jour"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "Paramètres système…"
+#~ msgid "Restart Instead…"
+#~ msgstr "Redémarrer pour achever les mises à jour..."
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "Dispositifs d'affichage..."
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr ""
+#~ "Certaines mises à jour logicielles ne s'appliqueront pas tant que "
+#~ "l'ordinateur n'aura pas redémarré."
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "Applications au démarrage..."
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "0"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "Périphériques connectés"
+#~ msgid "Switch From %s…"
+#~ msgstr "Changer depuis %s…"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "Imprimantes"
+#~ msgid "Software Up to Date"
+#~ msgstr "Système à jour"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "Scanners"
+#~ msgid "Updates Available…"
+#~ msgstr "Mises à jour disponibles..."
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "Webcam"
+#~ msgid "Updates Installing…"
+#~ msgstr "Mises à jour en cours d'installation..."
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Mettre en veille"
+#~ msgid "Restart to Complete Updates…"
+#~ msgstr "Redémarrer pour achever les mises à jour..."
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Hiberner"
+#~ msgid "Displays…"
+#~ msgstr "Dispositifs d'affichage..."
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Session d'invité"
+#~ msgid "Startup Applications…"
+#~ msgstr "Applications au démarrage..."
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "Invité"
+#~ msgid "Attached Devices"
+#~ msgstr "Périphériques connectés"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "Comptes en ligne..."
+#~ msgid "Printers"
+#~ msgstr "Imprimantes"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "Comptes utilisateurs…"
+#~ msgid "Scanners"
+#~ msgstr "Scanners"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "Webcam %s"
+#~ msgid "Webcam"
+#~ msgstr "Webcam"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "Scanner"
+#~ msgid "User Accounts…"
+#~ msgstr "Comptes utilisateurs…"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "Scanner %s"
+#~ msgid "%s Webcam"
+#~ msgstr "Webcam %s"
+
+#~ msgid "Scanner"
+#~ msgstr "Scanner"
+
+#~ msgid "%s Scanner"
+#~ msgstr "Scanner %s"
 
 #~ msgid "Shut Down..."
 #~ msgstr "Éteindre…"
@@ -307,11 +342,6 @@ msgstr "Scanner %s"
 #~ msgid "Switch User..."
 #~ msgstr "Changer d'utilisateur..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Certaines mises à jour logicielles ne seront effectives qu'après un "
-#~ "redémarrage de l'ordinateur."
-
 #~ msgctxt "button auth"
 #~ msgid "Restart..."
 #~ msgstr "Redémarrer..."
@@ -323,7 +353,8 @@ msgstr "Scanner %s"
 #~ msgid "Shut Down..."
 #~ msgstr "Éteindre..."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr ""
 #~ "Fait en sorte que le bouton de redémarrage n'apparaisse pas dans le menu."
 
@@ -331,7 +362,6 @@ msgstr "Scanner %s"
 #~ "Makes it so that the shutdown button doesn't show in the session menu."
 #~ msgstr "Fait en sorte que le bouton d'arrêt n'apparaisse pas dans le menu."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Passer de %s à..."
 
@@ -346,5 +376,5 @@ msgstr "Scanner %s"
 
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
 #~ msgstr ""
-#~ "Fait en sorte que le bouton de fermeture de session n'apparaisse pas dans le "
-#~ "menu."
+#~ "Fait en sorte que le bouton de fermeture de session n'apparaisse pas dans "
+#~ "le menu."
diff --git a/po/fr_CA.po b/po/fr_CA.po
new file mode 100644
index 0000000..aa6d6ad
--- /dev/null
+++ b/po/fr_CA.po
@@ -0,0 +1,205 @@
+# French translations for PACKAGE package.
+# Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
+"PO-Revision-Date: 2017-07-21 15:41+0200\n"
+"Last-Translator: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n"
+"Language-Team: French\n"
+"Language: fr_CA\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
+msgid ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
+msgid "Remove the Log Out item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
+msgid "Remove the Restart item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
+msgid "Remove the shutdown item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr ""
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
+msgstr ""
+
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
+
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
+
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
+
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
+
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
+
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
+
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
+
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
+
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
+
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
+
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
+
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
+msgstr ""
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr ""
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr ""
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
+msgid "Log Out"
+msgstr ""
+
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr ""
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr ""
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr ""
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr ""
+
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr ""
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:818
+msgid "Are you sure you want to close all programs and log out?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:819
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
diff --git a/po/frp.po b/po/frp.po
new file mode 100644
index 0000000..074ec2e
--- /dev/null
+++ b/po/frp.po
@@ -0,0 +1,204 @@
+# Language frp translations for PACKAGE package.
+# Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
+"PO-Revision-Date: 2017-07-21 15:41+0200\n"
+"Last-Translator: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n"
+"Language-Team: Language frp\n"
+"Language: frp\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
+msgid ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
+msgid "Remove the Log Out item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
+msgid "Remove the Restart item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
+msgid "Remove the shutdown item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr ""
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
+msgstr ""
+
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
+
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
+
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
+
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
+
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
+
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
+
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
+
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
+
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
+
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
+
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
+
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
+msgstr ""
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr ""
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr ""
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
+msgid "Log Out"
+msgstr ""
+
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr ""
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr ""
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr ""
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr ""
+
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr ""
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:818
+msgid "Are you sure you want to close all programs and log out?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:819
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
diff --git a/po/fy.po b/po/fy.po
index 8ffb023..cbb98bb 100644
--- a/po/fy.po
+++ b/po/fy.po
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
 "PO-Revision-Date: 2011-08-21 11:47+0000\n"
 "Last-Translator: Sense Egbert Hofstede <u@sensehofstede.nl>\n"
 "Language-Team: Frisian <fy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,278 +19,278 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
 msgstr ""
+"De dialooch om ôfmelde, opnij starte en ôfslute te befêstigje ûnderdrukke"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
+"Oft der befêstigingsdialoochen sjen matte wurde litten foar it ôfmelde, "
+"opnij starte en ôfslute."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Smiet de ôfmeldkar út it sesjemenu"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Smiet de opnij-startekar út it sesjemenu"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
-msgstr "Smiet de ôfslutkar út it sesjemenu"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
-msgstr ""
-"De dialooch om ôfmelde, opnij starte en ôfslute te befêstigje ûnderdrukke"
+msgid "Remove the shutdown item from the session menu"
+msgstr "Smiet de ôfslutkar út it sesjemenu"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
-"Oft der befêstigingsdialoochen sjen matte wurde litten foar it ôfmelde, "
-"opnij starte en ôfslute."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "Klassike gastsesje"
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
+msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "Start in gastsesje mei it klassike buroblêd"
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Skerm skoattelje"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Ôfslute"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Ôfmelde"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Opnij starte"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Ôfmelde..."
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "Systeemynstellingen..."
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Opnij starte..."
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "Online akkounts..."
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Ôfslute..."
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "Ôfmelde"
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "Online akkounts..."
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "Opnij starte"
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
-msgstr "Ôfslute"
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "Online akkounts..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
 msgstr ""
-"Witte jo it seker dat jo alle programma's wol slute en fan de kompjûter ôf "
-"wol melde?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
+#: ../src/service.c:594
+msgid "Lock"
 msgstr ""
-"Witte jo it seker dat jo alle programma's wol slute en de kompjûter opnij "
-"wol starte?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
-msgstr ""
-"Witte jo it seker dat jo alle programma's wol slute en de kompjûter ôf wol "
-"slute?"
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Gastsessje"
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Ôfmelde..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Ôfmelde"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Ûnderbrekke"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Sliepe"
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr "Opnij starte..."
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
 msgid "Restart"
 msgstr "Opnij starte"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr "Ôfslute..."
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
 msgstr "Ôfslute"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Ôfmelde"
-
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr ""
+"Witte jo it seker dat jo alle programma's wol slute en fan de kompjûter ôf "
+"wol melde?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
 msgstr ""
+"Sommige softwarebywurkings sille net ôf binne oant de kompjûter opnij start "
+"is."
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Dochs opnij starte"
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "Ôfbrekke"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
+"Witte jo it seker dat jo alle programma's wol slute en de kompjûter opnij "
+"wol starte?"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
+"Witte jo it seker dat jo alle programma's wol slute en de kompjûter ôf wol "
+"slute?"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "Ôfbrekke"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "1"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "Software bywurke"
+#~ msgid "Classic Guest Session"
+#~ msgstr "Klassike gastsesje"
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "Bywurkingen beskikber..."
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "Start in gastsesje mei it klassike buroblêd"
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "Bywurkingen oan it ynstallearje..."
+#~ msgid "Lock Screen"
+#~ msgstr "Skerm skoattelje"
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Ôfmelde"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "Systeemynstellingen..."
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Opnij starte"
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "Werjeftes..."
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Ôfslute"
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "Opstarttapassingen..."
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Ôfmelde"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "Oansluten apparaten"
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Opnij starte"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "Drukkers"
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Ôfslute"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "Scanners"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Ôfmelde"
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "Webcam"
+#~ msgid "Restart Instead"
+#~ msgstr "Dochs opnij starte"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Ûnderbrekke"
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "1"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Sliepe"
+#~ msgid "Software Up to Date"
+#~ msgstr "Software bywurke"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Gastsessje"
+#~ msgid "Updates Available…"
+#~ msgstr "Bywurkingen beskikber..."
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr ""
+#~ msgid "Updates Installing…"
+#~ msgstr "Bywurkingen oan it ynstallearje..."
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "Online akkounts..."
+#~ msgid "Displays…"
+#~ msgstr "Werjeftes..."
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr ""
+#~ msgid "Startup Applications…"
+#~ msgstr "Opstarttapassingen..."
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr ""
+#~ msgid "Attached Devices"
+#~ msgstr "Oansluten apparaten"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr ""
+#~ msgid "Printers"
+#~ msgstr "Drukkers"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr ""
+#~ msgid "Scanners"
+#~ msgstr "Scanners"
+
+#~ msgid "Webcam"
+#~ msgstr "Webcam"
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Skeakelje fan %s..."
 
@@ -316,11 +317,6 @@ msgstr ""
 #~ msgid "Restart..."
 #~ msgstr "Opnij starte..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Sommige softwarebywurkings sille net ôf binne oant de kompjûter opnij start "
-#~ "is."
-
 #~ msgid "Restart Instead..."
 #~ msgstr "Dochs opnij starte..."
 
@@ -328,7 +324,8 @@ msgstr ""
 #~ msgid "Shut Down..."
 #~ msgstr "Ôfslute..."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr ""
 #~ "Makket it sa dat de opnij-starte-knop net te sjen is yn it sesjemenu."
 
diff --git a/po/ga.po b/po/ga.po
new file mode 100644
index 0000000..67787a5
--- /dev/null
+++ b/po/ga.po
@@ -0,0 +1,205 @@
+# Irish translations for PACKAGE package.
+# Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
+"PO-Revision-Date: 2017-07-21 15:41+0200\n"
+"Last-Translator: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n"
+"Language-Team: Irish\n"
+"Language: ga\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n==2 ? 1 : 2;\n"
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
+msgid ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
+msgid "Remove the Log Out item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
+msgid "Remove the Restart item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
+msgid "Remove the shutdown item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr ""
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
+msgstr ""
+
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
+
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
+
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
+
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
+
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
+
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
+
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
+
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
+
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
+
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
+
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
+
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
+msgstr ""
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr ""
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr ""
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
+msgid "Log Out"
+msgstr ""
+
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr ""
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr ""
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr ""
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr ""
+
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr ""
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:818
+msgid "Are you sure you want to close all programs and log out?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:819
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
diff --git a/po/gd.po b/po/gd.po
index 2762b3b..a629368 100644
--- a/po/gd.po
+++ b/po/gd.po
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
 "PO-Revision-Date: 2011-09-15 20:49+0000\n"
 "Last-Translator: alasdair caimbeul <Unknown>\n"
 "Language-Team: Gaelic; Scottish <gd@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,291 +19,327 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
 msgstr ""
-"Dèan e mar nach nochd am putan log a-mach anns a'chlar-iùil an t-seisean."
+"Mùch a' co-abairt son dearbhadh gnìomh log a-mach, ath-tòisich agus dùin sìos"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-"Dèan e mar nach nochd am putan ath-thòisich anns a'chlar-iùil an t-seisean."
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
-"Dèan e mar nach nochd am putan dùin-sios anns a'chlar-iùil an t-seisean."
+"Foillsich no falaich?co-abairt son dearbhadh gnìomh log a-mach, ath-tòisich "
+"agus dùin sìos."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Gluais a ni Log a-mach bhon Clàr-iùil an t-seisein"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+"Dèan e mar nach nochd am putan log a-mach anns a'chlar-iùil an t-seisean."
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Gluais a ni ath-tòisich bhon Clàr-iùil an t-seisein"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
+"Dèan e mar nach nochd am putan ath-thòisich anns a'chlar-iùil an t-seisean."
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
 msgid "Remove the shutdown item from the session menu"
 msgstr "Gluais a ni dùin sìos bhon Clàr-iùil an t-seisein"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
-"Mùch a' co-abairt son dearbhadh gnìomh log a-mach, ath-tòisich agus dùin sìos"
+"Dèan e mar nach nochd am putan dùin-sios anns a'chlar-iùil an t-seisean."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"Foillsich no falaich?co-abairt son dearbhadh gnìomh log a-mach, ath-tòisich "
-"agus dùin sìos."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "Seasan Aoigheachd Clasaigeach"
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "Tòisich seasan aoigheachd cleachdadh bàrr-deasc clasaigeach"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "Aoigh"
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Glais  Sgrìn"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Dùin sìos"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Log a-mach"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Ath-tòisich"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "Suidheachaidhean Siostam..."
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Log a-mach..."
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "Cunntasan Air Loidhne..."
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Ath-tòisich..."
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Dùin Sìos..."
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "Suidse Cunntas Cleachdaiche..."
+
+#: ../src/service.c:575 ../src/service.c:591
+#, fuzzy
+msgid "Switch Account"
+msgstr "Suidse Cunntas Cleachdaiche..."
+
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "Suidse Cunntas Cleachdaiche..."
+
+#: ../src/service.c:588
+#, fuzzy
+msgid "Lock/Switch Account"
+msgstr "Suidse Cunntas Cleachdaiche..."
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Seisean Aoigheachd"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Log a-mach..."
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Log a-mach"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Cuir air thaobh"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Cadal-gheamhraidh"
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr "Ath-tòisich..."
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
 msgid "Restart"
 msgstr "Ath-tòisich"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr "Dùin Sìos..."
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
 msgstr "Dùin sìos"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr ""
 "Cinnteach gu bheil thu ag iarraidh dùnadh na prògraman gu lèir agus log a-"
 "mach don coimpiutair?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+"Tha cuid ùrachadh bathar-bòg nach d'thig gu buil gus a' coimpiutair ath-"
+"thòiseachadh  a-rithist."
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "Sguir"
+
+#: ../src/backend-dbus/actions.c:862
 msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
 "Cinnteach gu bheil thu ag iarraidh dùnadh na prògraman gu lèir agus  ath-"
 "thòiseachadh a choimpiutair?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
 "Cinnteach gu bheil thu ag iarraidh dùnadh na prògraman gu lèir agus dùinadh "
 "sìos a choimpiutair?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "Log a-mach"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Ath-tòisich"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Dùin sìos"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Log a-mach"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr "Ath-tòisich..."
+#~ msgid "Classic Guest Session"
+#~ msgstr "Seasan Aoigheachd Clasaigeach"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr "Dùin Sìos..."
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "Tòisich seasan aoigheachd cleachdadh bàrr-deasc clasaigeach"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Ath-tòisich an àite"
+#~ msgid "Lock Screen"
+#~ msgstr "Glais  Sgrìn"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "Ath-thòisich an àite..."
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Log a-mach"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
-"Cha bhuilich cuid ùrachaidhean bathar-bog gus ath thòiseachadh a' "
-"choimpiutar a-rithist."
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Ath-tòisich"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "Sguir"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Dùin sìos"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "1"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Log a-mach"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr "Suidse Cunntas Cleachdaiche..."
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Ath-tòisich"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "Suidse Bhon %s…"
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Dùin sìos"
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "Bathar-bog a dh'ionnsaigh an là"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Log a-mach"
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "Ùrachaidhean ri làimh..."
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "Ath-tòisich..."
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "Ùrachaidhean stàlachadh..."
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "Dùin Sìos..."
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr "Ath-tòisich gu crìochnaich ùrachaidhean..."
+#~ msgid "Restart Instead"
+#~ msgstr "Ath-tòisich an àite"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "Suidheachaidhean Siostam..."
+#~ msgid "Restart Instead…"
+#~ msgstr "Ath-thòisich an àite..."
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "Clàran taisbeanaidh..."
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr ""
+#~ "Cha bhuilich cuid ùrachaidhean bathar-bog gus ath thòiseachadh a' "
+#~ "choimpiutar a-rithist."
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "Prògraman tòiseachadh"
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "1"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "Innleachdan Ceangailte"
+#~ msgid "Switch From %s…"
+#~ msgstr "Suidse Bhon %s…"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "Clò-bhualadairean"
+#~ msgid "Software Up to Date"
+#~ msgstr "Bathar-bog a dh'ionnsaigh an là"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "Sganairean"
+#~ msgid "Updates Available…"
+#~ msgstr "Ùrachaidhean ri làimh..."
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "Cam-lìon"
+#~ msgid "Updates Installing…"
+#~ msgstr "Ùrachaidhean stàlachadh..."
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Cuir air thaobh"
+#~ msgid "Restart to Complete Updates…"
+#~ msgstr "Ath-tòisich gu crìochnaich ùrachaidhean..."
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Cadal-gheamhraidh"
+#~ msgid "Displays…"
+#~ msgstr "Clàran taisbeanaidh..."
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Seisean Aoigheachd"
+#~ msgid "Startup Applications…"
+#~ msgstr "Prògraman tòiseachadh"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "Aoigh"
+#~ msgid "Attached Devices"
+#~ msgstr "Innleachdan Ceangailte"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "Cunntasan Air Loidhne..."
+#~ msgid "Printers"
+#~ msgstr "Clò-bhualadairean"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "Cunntasan Cleachdaiche..."
+#~ msgid "Scanners"
+#~ msgstr "Sganairean"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "%s Lìoncam"
+#~ msgid "Webcam"
+#~ msgstr "Cam-lìon"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "Sganair"
+#~ msgid "User Accounts…"
+#~ msgstr "Cunntasan Cleachdaiche..."
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "%s Sganair"
+#~ msgid "%s Webcam"
+#~ msgstr "%s Lìoncam"
+
+#~ msgid "Scanner"
+#~ msgstr "Sganair"
+
+#~ msgid "%s Scanner"
+#~ msgstr "%s Sganair"
 
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
 #~ msgstr ""
-#~ "Dèanamh e mar nach bi a' putan log a-mach nochdadh  anns a' clàr-iùil an t-"
-#~ "seisein."
+#~ "Dèanamh e mar nach bi a' putan log a-mach nochdadh  anns a' clàr-iùil an "
+#~ "t-seisein."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr ""
-#~ "Dèanamh e mar nach bi a' putan ath-tòisich nochdadh  anns a' clàr-iùil an t-"
-#~ "seisein."
+#~ "Dèanamh e mar nach bi a' putan ath-tòisich nochdadh  anns a' clàr-iùil an "
+#~ "t-seisein."
 
 #~ msgid "Shut Down..."
 #~ msgstr "Dùin sìos..."
@@ -330,7 +367,6 @@ msgstr "%s Sganair"
 #~ msgid "Session"
 #~ msgstr "Seisean"
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Suidse bhon %s..."
 
@@ -345,8 +381,3 @@ msgstr "%s Sganair"
 #~ msgstr ""
 #~ "Dèanamh e mar nach bi a' putan dùin sìos nochdadh  anns a' clàr-iùil an t-"
 #~ "seisein."
-
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Tha cuid ùrachadh bathar-bòg nach d'thig gu buil gus a' coimpiutair ath-"
-#~ "thòiseachadh  a-rithist."
diff --git a/po/gl.po b/po/gl.po
index 79ee6cb..a57e850 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
 "PO-Revision-Date: 2011-09-19 11:05+0000\n"
 "Last-Translator: Fran Diéguez <Unknown>\n"
 "Language-Team: Galician <gl@li.org>\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,275 +19,309 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr "Fai que o botón de saír da sesión non se mostre no menú de sesión."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+"Suprimir a caixa de diálogo para confirmar que se vai saír da sesión, "
+"reiniciar ou apagar"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr "Fai que o botón de reiniciar non se mostre no menú de sesión."
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
-msgstr "Fai que o botón de apagado non se mostre no menú de sesión."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+"Cando mostrar ou non os diálogos de confirmación nas accións de saír da "
+"sesión, reiniciar ou apagar."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Elimina o elemento Saír da sesión do menú de sesión"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr "Fai que o botón de saír da sesión non se mostre no menú de sesión."
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Eliminar o elemento Reiniciar do menú de sesión"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr "Fai que o botón de reiniciar non se mostre no menú de sesión."
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
 msgid "Remove the shutdown item from the session menu"
 msgstr "Eliminar o elemento Apagar do menú de sesión"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr "Fai que o botón de apagado non se mostre no menú de sesión."
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"Suprimir a caixa de diálogo para confirmar que se vai saír da sesión, "
-"reiniciar ou apagar"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
-"Cando mostrar ou non os diálogos de confirmación nas accións de saír da "
-"sesión, reiniciar ou apagar."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "Sesión de convidado clásica"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "Convidado"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "Iniciar unha sesión de convidado usando o escritorio clásico"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Bloquear a pantalla"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Apagar"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Saír da sesión"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "Opcións do sistema..."
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Reiniciar"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "Contas en liña..."
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Saír da sesión..."
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Reiniciar..."
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "Cambiar conta de usuario..."
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Apagar..."
+#: ../src/service.c:575 ../src/service.c:591
+#, fuzzy
+msgid "Switch Account"
+msgstr "Cambiar conta de usuario..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "Cambiar conta de usuario..."
+
+#: ../src/service.c:588
+#, fuzzy
+msgid "Lock/Switch Account"
+msgstr "Cambiar conta de usuario..."
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Sesión de convidado"
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Saír da sesión..."
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Saír da sesión"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Suspender"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Hibernar"
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr "Reiniciar..."
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
 msgid "Restart"
 msgstr "Reiniciar"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr "Apagar..."
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
 msgstr "Apagar"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
+msgstr "Ten certeza de que desexa pechar todos os programas e saír da sesión?"
+
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
 msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+"Some software updates won't be applied until the computer next restarts."
 msgstr ""
-"Ten certeza de que desexa pechar todos os programas e saír da sesión?"
+"Algunhas actualizacións de software non serán efectivas ata que o computador "
+"sexa reiniciado."
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: ../src/backend-dbus/actions.c:862
 msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
 "Ten certeza de que desexa pechar todos os programas e reiniciar o computador?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
 "Ten certeza de que desexa pechar todos os programas e apagar o computador?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "Saír da sesión"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Reiniciar"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Apagar"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Saír da sesión"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr "Reiniciar..."
+#~ msgid "Classic Guest Session"
+#~ msgstr "Sesión de convidado clásica"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr "Apagar..."
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "Iniciar unha sesión de convidado usando o escritorio clásico"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Mellor reiniciar"
+#~ msgid "Lock Screen"
+#~ msgstr "Bloquear a pantalla"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "Restart no lugar…"
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Saír da sesión"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
-"Algunhas actualizacións non se aplicarán até que o computador se reinicie."
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Reiniciar"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "Cancelar"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Apagar"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "1"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Saír da sesión"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr "Cambiar conta de usuario..."
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Reiniciar"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "Cambiar de %s…"
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Apagar"
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "Software actualizado"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Saír da sesión"
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "Actualizacións dispoñíbeis..."
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "Reiniciar..."
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "Actualizacións instalándose..."
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "Apagar..."
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr "Reiniciar para completar a anovación…"
+#~ msgid "Restart Instead"
+#~ msgstr "Mellor reiniciar"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "Opcións do sistema..."
+#~ msgid "Restart Instead…"
+#~ msgstr "Restart no lugar…"
+
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr ""
+#~ "Algunhas actualizacións non se aplicarán até que o computador se reinicie."
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "Pantallas..."
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "1"
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "Aplicativos ao inicio..."
+#~ msgid "Switch From %s…"
+#~ msgstr "Cambiar de %s…"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "Dispositivos conectados"
+#~ msgid "Software Up to Date"
+#~ msgstr "Software actualizado"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "Impresoras"
+#~ msgid "Updates Available…"
+#~ msgstr "Actualizacións dispoñíbeis..."
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "Escáneres"
+#~ msgid "Updates Installing…"
+#~ msgstr "Actualizacións instalándose..."
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "Cámara web"
+#~ msgid "Restart to Complete Updates…"
+#~ msgstr "Reiniciar para completar a anovación…"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Suspender"
+#~ msgid "Displays…"
+#~ msgstr "Pantallas..."
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Hibernar"
+#~ msgid "Startup Applications…"
+#~ msgstr "Aplicativos ao inicio..."
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Sesión de convidado"
+#~ msgid "Attached Devices"
+#~ msgstr "Dispositivos conectados"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "Convidado"
+#~ msgid "Printers"
+#~ msgstr "Impresoras"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "Contas en liña..."
+#~ msgid "Scanners"
+#~ msgstr "Escáneres"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "Contas de usuario…"
+#~ msgid "Webcam"
+#~ msgstr "Cámara web"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "Cámara web %s"
+#~ msgid "User Accounts…"
+#~ msgstr "Contas de usuario…"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "Escáner"
+#~ msgid "%s Webcam"
+#~ msgstr "Cámara web %s"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "Escáner %s"
+#~ msgid "Scanner"
+#~ msgstr "Escáner"
+
+#~ msgid "%s Scanner"
+#~ msgstr "Escáner %s"
 
 #~ msgid "Restart..."
 #~ msgstr "Reiniciar..."
@@ -304,15 +339,9 @@ msgstr "Escáner %s"
 #~ msgid "Restart..."
 #~ msgstr "Reiniciar..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Algunhas actualizacións de software non serán efectivas ata que o computador "
-#~ "sexa reiniciado."
-
 #~ msgid "Restart Instead..."
 #~ msgstr "Mellor reiniciar..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Cambiar de %s..."
 
@@ -320,7 +349,8 @@ msgstr "Escáner %s"
 #~ msgid "Shut Down..."
 #~ msgstr "Apagar..."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "Fai que o botón de reiniciar non se mostre no menú de sesión."
 
 #~ msgid ""
diff --git a/po/gu.po b/po/gu.po
index 9ed399b..b623676 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
 "PO-Revision-Date: 2009-10-05 12:39+0000\n"
 "Last-Translator: raj <Unknown>\n"
 "Language-Team: Gujarati <gu@li.org>\n"
+"Language: gu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,20 +19,21 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgid ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
-msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+msgid "Remove the Log Out item from the session menu"
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
-msgid "Remove the Log Out item from the session menu"
+msgid "Makes it so that the logout button doesn’t show in the session menu."
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
@@ -39,243 +41,166 @@ msgid "Remove the Restart item from the session menu"
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgid "Remove the shutdown item from the session menu"
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
-msgstr ""
-
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr ""
-
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
+#: ../src/service.c:325
+msgid "Guest"
 msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
 msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
 msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
+#: ../src/service.c:346
+msgid "About This Computer"
 msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
+#: ../src/service.c:361
+msgid "System Settings…"
 msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
+#: ../src/service.c:363
+msgid "Online Accounts…"
 msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
+#: ../src/service.c:566
+msgid "Start Screen Saver"
 msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
 msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
 msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
 msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
 msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
+#: ../src/service.c:594
+msgid "Lock"
 msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
+#: ../src/service.c:619
+msgid "Guest Session"
 msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
+#: ../src/service.c:696
+msgid "Log Out…"
 msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr ""
-
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr ""
-
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr ""
-
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr ""
-
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
-
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr ""
-
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr ""
-
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr ""
-
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr ""
-
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr ""
-
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr ""
-
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr ""
-
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr ""
-
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr ""
-
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
+#: ../src/service.c:714
+msgid "Suspend"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
+#: ../src/service.c:717
+msgid "Hibernate"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
+#: ../src/service.c:722
+msgid "Restart…"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
+#: ../src/service.c:729
+msgid "Shut Down…"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
+#: ../src/backend-dbus/actions.c:818
+msgid "Are you sure you want to close all programs and log out?"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
+#: ../src/backend-dbus/actions.c:819
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
 msgstr ""
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
 msgstr ""
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
diff --git a/po/he.po b/po/he.po
index f55d984..46a8c34 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
 "PO-Revision-Date: 2011-09-24 09:39+0000\n"
 "Last-Translator: Yaron <sh.yaron@gmail.com>\n"
 "Language-Team: Hebrew\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,271 +19,302 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr "Makes it so that the logout button doesn’t show in the session menu."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr "Suppress the dialog to confirm logout, restart and shutdown action"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-"Makes it so that the restart button doesn’t show in the session menu."
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Remove the Log Out item from the session menu"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr "Makes it so that the logout button doesn’t show in the session menu."
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Remove the Restart item from the session menu"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
-msgstr "Remove the shutdown item from the session menu"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr "Makes it so that the restart button doesn’t show in the session menu."
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
-msgstr "Suppress the dialog to confirm logout, restart and shutdown action"
+msgid "Remove the shutdown item from the session menu"
+msgstr "Remove the shutdown item from the session menu"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr "Makes it so that the shutdown button doesn’t show in the session menu."
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "הפעלת אורח קלסית"
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "התחלת הפעלת אורח עם שולחן העבודה הקלסי"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "אורח"
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "נעילת המסך"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "כיבוי"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "יציאה"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "הפעלה מחדש"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "הגדרות מערכת…"
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "יציאה…"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "חשבונות מקוונים…"
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "הפעלה מחדש…"
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "כיבוי…"
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "החלפת חשבון משתמש…"
+
+#: ../src/service.c:575 ../src/service.c:591
+#, fuzzy
+msgid "Switch Account"
+msgstr "החלפת חשבון משתמש…"
+
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "החלפת חשבון משתמש…"
+
+#: ../src/service.c:588
+#, fuzzy
+msgid "Lock/Switch Account"
+msgstr "החלפת חשבון משתמש…"
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "הפעלת אורח"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "יציאה…"
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "יציאה"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "השהיה"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "תרדמת"
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr "הפעלה מחדש…"
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
 msgid "Restart"
 msgstr "הפעלה מחדש"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr "כיבוי…"
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
 msgstr "כיבוי"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr "האם ברצונך לסגור את כל התכניות ולצאת מההפעלה?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr "כמה מעדכוני התכנה לא יחולו עד להפעלה הבאה של המחשב."
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "ביטול"
+
+#: ../src/backend-dbus/actions.c:862
 msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr "האם ברצונך לסגור את כל התכניות ולהפעיל את המחשב מחדש?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr "האם לסגור את כל התכניות ולכבות את המחשב?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "יציאה"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "הפעלה מחדש"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "כיבוי"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "יציאה"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr "הפעלה מחדש…"
+#~ msgid "Classic Guest Session"
+#~ msgstr "הפעלת אורח קלסית"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr "כיבוי…"
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "התחלת הפעלת אורח עם שולחן העבודה הקלסי"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "הפעלה מחדש במקום"
+#~ msgid "Lock Screen"
+#~ msgstr "נעילת המסך"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "הפעלה מחדש במקום…"
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "יציאה"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr "חלק מעדכוני התקנה לא יחולו עד שהמחשב יופעל מחדש בפעם הבאה."
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "הפעלה מחדש"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "ביטול"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "כיבוי"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "1"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "יציאה"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr "החלפת חשבון משתמש…"
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "הפעלה מחדש"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "החלפה מהמשתמש %s…"
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "כיבוי"
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "התכנה עדכנית"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "יציאה"
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "ישנם עדכונים זמינים…"
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "הפעלה מחדש…"
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "העדכונים מותקנים…"
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "כיבוי…"
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr "יש להפעיל מחדש כדי להשלים את העדכונים…"
+#~ msgid "Restart Instead"
+#~ msgstr "הפעלה מחדש במקום"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "הגדרות מערכת…"
+#~ msgid "Restart Instead…"
+#~ msgstr "הפעלה מחדש במקום…"
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "תצוגות…"
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr "חלק מעדכוני התקנה לא יחולו עד שהמחשב יופעל מחדש בפעם הבאה."
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "יישומים בזמן ההפעלה…"
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "1"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "התקנים מחוברים"
+#~ msgid "Switch From %s…"
+#~ msgstr "החלפה מהמשתמש %s…"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "מדפסות"
+#~ msgid "Software Up to Date"
+#~ msgstr "התכנה עדכנית"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "סורקים"
+#~ msgid "Updates Available…"
+#~ msgstr "ישנם עדכונים זמינים…"
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "מצלמת רשת"
+#~ msgid "Updates Installing…"
+#~ msgstr "העדכונים מותקנים…"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "השהיה"
+#~ msgid "Restart to Complete Updates…"
+#~ msgstr "יש להפעיל מחדש כדי להשלים את העדכונים…"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "תרדמת"
+#~ msgid "Displays…"
+#~ msgstr "תצוגות…"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "הפעלת אורח"
+#~ msgid "Startup Applications…"
+#~ msgstr "יישומים בזמן ההפעלה…"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "אורח"
+#~ msgid "Attached Devices"
+#~ msgstr "התקנים מחוברים"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "חשבונות מקוונים…"
+#~ msgid "Printers"
+#~ msgstr "מדפסות"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "חשבונות משתמשים…"
+#~ msgid "Scanners"
+#~ msgstr "סורקים"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "מצלמת רשת מסוג %s"
+#~ msgid "Webcam"
+#~ msgstr "מצלמת רשת"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "סורק"
+#~ msgid "User Accounts…"
+#~ msgstr "חשבונות משתמשים…"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "סורק מסוג %s"
+#~ msgid "%s Webcam"
+#~ msgstr "מצלמת רשת מסוג %s"
+
+#~ msgid "Scanner"
+#~ msgstr "סורק"
+
+#~ msgid "%s Scanner"
+#~ msgstr "סורק מסוג %s"
 
 #~ msgid "Restart..."
 #~ msgstr "הפעלה מחדש..."
@@ -308,9 +340,11 @@ msgstr "סורק מסוג %s"
 #~ msgstr "כיבוי..."
 
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
-#~ msgstr "Makes it so that the logout button doesn't show in the session menu."
+#~ msgstr ""
+#~ "Makes it so that the logout button doesn't show in the session menu."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr ""
 #~ "Makes it so that the restart button doesn't show in the session menu."
 
@@ -319,10 +353,6 @@ msgstr "סורק מסוג %s"
 #~ msgstr ""
 #~ "Makes it so that the shutdown button doesn't show in the session menu."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr "כמה מעדכוני התכנה לא יחולו עד להפעלה הבאה של המחשב."
-
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "החלפה מהמשתמש %s..."
 
diff --git a/po/hi.po b/po/hi.po
index c57cbd8..01b0363 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
 "PO-Revision-Date: 2011-09-15 09:58+0000\n"
 "Last-Translator: Sebastien Bacher <seb128@ubuntu.com>\n"
 "Language-Team: Hindi\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,274 +19,231 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr ""
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr "लॉगआउट, पुनः प्रारंभ और बंद करे क्रिया की पुष्टि वाले संवाद दबाएं"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
-msgstr ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr "लॉगआउट, पुनः प्रारंभ और बंद करे क्रियाओं के लिए पुष्टिकरण संवाद दिखाएं या नहीं."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "सत्र सूची से लाँगआउट मद को हटा दें"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "सत्र सूची से पुनःआरंभ मद को हटा दें"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
-msgstr "सत्र सूची से बंद करे मद को हटा दें"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
-msgstr "लॉगआउट, पुनः प्रारंभ और बंद करे क्रिया की पुष्टि वाले संवाद दबाएं"
+msgid "Remove the shutdown item from the session menu"
+msgstr "सत्र सूची से बंद करे मद को हटा दें"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
-"लॉगआउट, पुनः प्रारंभ और बंद करे क्रियाओं के लिए पुष्टिकरण संवाद दिखाएं या "
-"नहीं."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "स्क्रीन पर ताला लगाएँ"
-
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "बंद करें"
-
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "लॉगआउट करें"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "पुनः आरंभ करें"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "सत्रांत करें..."
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "पुन:आरंभ करें..."
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "बंद करें..."
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "लॉगआउट करें"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "पुनः आरंभ करें"
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
-msgstr "बंद करें"
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
 msgstr ""
-"क्या आप अपने सभी कार्यक्रमों को बंद करने तथा कम्प्यूटर से लाँगआउट होना चाहते "
-"है?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
 msgstr ""
-"क्या आप अपने सभी कार्यक्रमों को बंद करने तथा कम्प्यूटर को पुनःप्रांरभ करना "
-"चाहते है?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
 msgstr ""
-"क्या आप अपने सभी कार्यक्रमों को बंद करने तथा कम्प्यूटर को बंद करना चाहते है?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "लॉग आउट करें"
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "पुनः आरंभ करें"
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "अतिथि सत्र"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "बंद करें"
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "सत्रांत करें..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
-msgstr "लॉग आउट करें"
+msgstr "लॉगआउट करें"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "स्थगित"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "सुप्तावस्था"
+
+#: ../src/service.c:722
 msgid "Restart…"
-msgstr ""
+msgstr "पुन:आरंभ करें..."
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "पुनः आरंभ करें"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
+#: ../src/service.c:729
 msgid "Shut Down…"
-msgstr ""
+msgstr "बंद करें..."
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "तुरंत पुनः आरंभ करें"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr "बंद करें"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
+msgstr "क्या आप अपने सभी कार्यक्रमों को बंद करने तथा कम्प्यूटर से लाँगआउट होना चाहते है?"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr "जब तक कम्य्पूटर पुनः चालू नहीं होता कुछ साँफ्टवेयर अद्यतन लागू नहीं होगा."
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
 msgid "Cancel"
 msgstr "रद्द"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "1"
-
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr ""
-
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr ""
-
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr ""
-
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr ""
-
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr ""
-
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr ""
-
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr "क्या आप अपने सभी कार्यक्रमों को बंद करने तथा कम्प्यूटर को पुनःप्रांरभ करना चाहते है?"
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr "क्या आप अपने सभी कार्यक्रमों को बंद करने तथा कम्प्यूटर को बंद करना चाहते है?"
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr ""
+#~ msgid "Lock Screen"
+#~ msgstr "स्क्रीन पर ताला लगाएँ"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "स्थगित"
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "लॉगआउट करें"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "सुप्तावस्था"
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "पुनः आरंभ करें"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "अतिथि सत्र"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "बंद करें"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "लॉग आउट करें"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "पुनः आरंभ करें"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "बंद करें"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr ""
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "लॉग आउट करें"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr ""
+#~ msgid "Restart Instead"
+#~ msgstr "तुरंत पुनः आरंभ करें"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr ""
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "1"
 
 #~ msgid "Log Out..."
 #~ msgstr "लॉग-आउट..."
@@ -300,14 +258,14 @@ msgstr ""
 #~ msgid "Shut Down..."
 #~ msgstr "बंद करें..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "%s से बदलें..."
 
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
 #~ msgstr "ऐसा करें कि सत्र सूची में लाँगआउट बटन न दिखे."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "ऐसा करें कि सत्र सूची में पुनःआरंभ बटन न दिखे."
 
 #~ msgid ""
@@ -324,10 +282,6 @@ msgstr ""
 #~ msgid "Restart..."
 #~ msgstr "पुनः आरंभ करें..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "जब तक कम्य्पूटर पुनः चालू नहीं होता कुछ साँफ्टवेयर अद्यतन लागू नहीं होगा."
-
 #~ msgid "Restart to Complete Update…"
 #~ msgstr "नवीनीकरण पूर्ण करने के लिए पुन:आरंभ करें..."
 
diff --git a/po/hr.po b/po/hr.po
index 5a253f9..88fb9f9 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
 "PO-Revision-Date: 2011-09-15 09:57+0000\n"
 "Last-Translator: Sebastien Bacher <seb128@ubuntu.com>\n"
 "Language-Team: Croatian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,274 +19,303 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr "Skriva tipku odjave u izborniku prijave."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr "Sakrij dijalog za potvrdu odjave, ponovnog pokretanja i isključivanja"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr "Skriva tipku ponovnog pokretanja u izborniku prijave."
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
-msgstr "Skriva tipku isključivanja u izborniku prijave."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+"Treba li prikazati dijalog za potvrdu odjave, ponovnog pokretanja i "
+"isključivanja računala."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Ukloni stavku \"Odjava\" iz izbornika"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr "Skriva tipku odjave u izborniku prijave."
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Ukloni tipku za ponovo pokretanje iz izbornika prijave"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr "Skriva tipku ponovnog pokretanja u izborniku prijave."
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
 msgid "Remove the shutdown item from the session menu"
 msgstr "Ukloni tipku za isključivanje iz izbornika prijave"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr "Skriva tipku isključivanja u izborniku prijave."
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"Sakrij dijalog za potvrdu odjave, ponovnog pokretanja i isključivanja"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
-"Treba li prikazati dijalog za potvrdu odjave, ponovnog pokretanja i "
-"isključivanja računala."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "Klasična prijava gosta"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "Gost"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "Pokrenite prijavu gosta koristeći klasično okruženje"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Zaključavanje zaslona"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Isključivanje"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Odjava"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "Postavke sustava..."
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Ponovno pokretanje"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "Online računi..."
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Odjava..."
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Ponovno pokretanje..."
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "Promjena korisničkog računa..."
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Isključivanje…"
+#: ../src/service.c:575 ../src/service.c:591
+#, fuzzy
+msgid "Switch Account"
+msgstr "Promjena korisničkog računa..."
+
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "Promjena korisničkog računa..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
+#: ../src/service.c:588
+#, fuzzy
+msgid "Lock/Switch Account"
+msgstr "Promjena korisničkog računa..."
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Prijava gosta"
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Odjava..."
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Odjava"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Suspenzija"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Hibernacija"
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr "Ponovno pokretanje..."
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
 msgid "Restart"
 msgstr "Ponovno pokretanje"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr "Isključivanje…"
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
 msgstr "Isključivanje"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr "Jeste li sigurni da želite zatvoriti sve programe i odjaviti se?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr "Neke dopune se neće primijeniti dok se računalo ponovno ne pokrene."
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "Otkaži"
+
+#: ../src/backend-dbus/actions.c:862
 msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
 "Jeste li sigurni da želite zatvoriti sve programe i ponovno pokrenuti "
 "računalo?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
 "Jeste li sigurni da želite zatvoriti sve programe i isključiti računalo?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "Odjava"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Ponovno pokretanje"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Isključivanje"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Odjava"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr "Ponovno pokretanje..."
+#~ msgid "Classic Guest Session"
+#~ msgstr "Klasična prijava gosta"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr "Isključivanje…"
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "Pokrenite prijavu gosta koristeći klasično okruženje"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Radije ponovno pokreni"
+#~ msgid "Lock Screen"
+#~ msgstr "Zaključavanje zaslona"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "Radije ponovno pokreni..."
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Odjava"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
-"Neke dopune neće biti instalirane dok se računalo ponovno ne pokrene."
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Ponovno pokretanje"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "Otkaži"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Isključivanje"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "1"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Odjava"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr "Promjena korisničkog računa..."
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Ponovno pokretanje"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "Promjena iz %s…"
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Isključivanje"
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "Softver ažuriran"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Odjava"
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "Dostupne dopune..."
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "Ponovno pokretanje..."
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "Dopune se instaliraju..."
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "Isključivanje…"
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr ""
+#~ msgid "Restart Instead"
+#~ msgstr "Radije ponovno pokreni"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "Postavke sustava..."
+#~ msgid "Restart Instead…"
+#~ msgstr "Radije ponovno pokreni..."
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "Zasloni..."
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr ""
+#~ "Neke dopune neće biti instalirane dok se računalo ponovno ne pokrene."
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "Početni programi..."
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "1"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "Priključeni uređaji"
+#~ msgid "Switch From %s…"
+#~ msgstr "Promjena iz %s…"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "Pisači"
+#~ msgid "Software Up to Date"
+#~ msgstr "Softver ažuriran"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "Skeneri"
+#~ msgid "Updates Available…"
+#~ msgstr "Dostupne dopune..."
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "Web kamera"
+#~ msgid "Updates Installing…"
+#~ msgstr "Dopune se instaliraju..."
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Suspenzija"
+#~ msgid "Displays…"
+#~ msgstr "Zasloni..."
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Hibernacija"
+#~ msgid "Startup Applications…"
+#~ msgstr "Početni programi..."
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Prijava gosta"
+#~ msgid "Attached Devices"
+#~ msgstr "Priključeni uređaji"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "Gost"
+#~ msgid "Printers"
+#~ msgstr "Pisači"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "Online računi..."
+#~ msgid "Scanners"
+#~ msgstr "Skeneri"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "Korisnički računi..."
+#~ msgid "Webcam"
+#~ msgstr "Web kamera"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "%s web kamera"
+#~ msgid "User Accounts…"
+#~ msgstr "Korisnički računi..."
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "Skener"
+#~ msgid "%s Webcam"
+#~ msgstr "%s web kamera"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "%s skener"
+#~ msgid "Scanner"
+#~ msgstr "Skener"
+
+#~ msgid "%s Scanner"
+#~ msgstr "%s skener"
 
 #~ msgid "Restart..."
 #~ msgstr "Ponovno pokretanje..."
@@ -303,13 +333,9 @@ msgstr "%s skener"
 #~ msgid "Restart..."
 #~ msgstr "Ponovno pokretanje..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr "Neke dopune se neće primijeniti dok se računalo ponovno ne pokrene."
-
 #~ msgid "Restart Instead..."
 #~ msgstr "Radije ponovno pokreni"
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Promjena iz %s..."
 
@@ -326,7 +352,8 @@ msgstr "%s skener"
 #~ msgid "Restart to Complete Update"
 #~ msgstr "Ponovno pokretanje za dovršetak nadogradnje"
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr ""
 #~ "Rezultira time da se tipka za ponovo pokretanje ne prikazuje u izborniku "
 #~ "prijave."
diff --git a/po/ht.po b/po/ht.po
new file mode 100644
index 0000000..b08b99e
--- /dev/null
+++ b/po/ht.po
@@ -0,0 +1,204 @@
+# Haitian translations for PACKAGE package.
+# Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
+"PO-Revision-Date: 2017-07-21 15:41+0200\n"
+"Last-Translator: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n"
+"Language-Team: Haitian\n"
+"Language: ht\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
+msgid ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
+msgid "Remove the Log Out item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
+msgid "Remove the Restart item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
+msgid "Remove the shutdown item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr ""
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
+msgstr ""
+
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
+
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
+
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
+
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
+
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
+
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
+
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
+
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
+
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
+
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
+
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
+
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
+msgstr ""
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr ""
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr ""
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
+msgid "Log Out"
+msgstr ""
+
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr ""
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr ""
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr ""
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr ""
+
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr ""
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:818
+msgid "Are you sure you want to close all programs and log out?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:819
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 25c7d1c..6e14203 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:41+0200\n"
 "PO-Revision-Date: 2011-09-15 16:33+0000\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,275 +19,310 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr "A kijelentkezés gomb elrejtése a munkamenet-menüben."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+"Kijelentkezés, újraindítás és leállítás megerősítő párbeszédpaneljének "
+"letiltása"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr "Az újraindítás gomb elrejtése a munkamenet-menüben."
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
-msgstr "A leállítás gomb elrejtése a munkamenet-menüben."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+"Megjelenjen párbeszédpanel a kijelentkezés, újraindítás és leállítás "
+"megerősítésére?"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "A Kijelentkezés elem eltávolítása a munkamenet menüből"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr "A kijelentkezés gomb elrejtése a munkamenet-menüben."
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Az újraindítás elem eltávolítása a munkamenet menüből"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr "Az újraindítás gomb elrejtése a munkamenet-menüben."
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
 msgid "Remove the shutdown item from the session menu"
 msgstr "A leállítás elem eltávolítása a munkamenet menüből"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr "A leállítás gomb elrejtése a munkamenet-menüben."
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"Kijelentkezés, újraindítás és leállítás megerősítő párbeszédpaneljének "
-"letiltása"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
-"Megjelenjen párbeszédpanel a kijelentkezés, újraindítás és leállítás "
-"megerősítésére?"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "Klasszikus vendég munkamenet"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "Vendég"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "Vendég munkamenet indítása a klasszikus munkamenet használatával"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Képernyő zárolása"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Leállítás"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Kijelentkezés"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "Rendszerbeállítások…"
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Újraindítás"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "Online fiókok…"
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Kijelentkezés…"
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Újraindítás…"
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "Felhasználóváltás…"
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Leállítás…"
+#: ../src/service.c:575 ../src/service.c:591
+#, fuzzy
+msgid "Switch Account"
+msgstr "Felhasználóváltás…"
+
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "Felhasználóváltás…"
+
+#: ../src/service.c:588
+#, fuzzy
+msgid "Lock/Switch Account"
+msgstr "Felhasználóváltás…"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Vendég-munkamenet"
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Kijelentkezés…"
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Kijelentkezés"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Felfüggesztés"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Hibernálás"
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr "Újraindítás…"
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
 msgid "Restart"
 msgstr "Újraindítás"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr "Leállítás…"
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
 msgstr "Leállítás"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr "Biztos, hogy bezárja az összes programot, és kilép a számítógépről?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+"Néhány szoftverfrissítés nem kerül alkalmazásra a számítógép következő "
+"újraindításáig."
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "Mégse"
+
+#: ../src/backend-dbus/actions.c:862
 msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
 "Biztos, hogy bezárja az összes programot, és újraindítja a számítógépet?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
 "Biztos, hogy bezárja az összes programot, és kikapcsolja a számítógépet?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "Kijelentkezés"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Újraindítás"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Leállítás"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Kijelentkezés"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr "Újraindítás…"
+#~ msgid "Classic Guest Session"
+#~ msgstr "Klasszikus vendég munkamenet"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr "Leállítás…"
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "Vendég munkamenet indítása a klasszikus munkamenet használatával"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Inkább újraindítom"
+#~ msgid "Lock Screen"
+#~ msgstr "Képernyő zárolása"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "Inkább újraindítás…"
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Kijelentkezés"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
-"Néhány szoftverfrissítés nem kerül alkalmazásra a számítógép következő "
-"újraindításáig."
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Újraindítás"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "Mégse"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Leállítás"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "emiatt van az hogy felhasználóváltás, ne fordítsd 1-re!"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Kijelentkezés"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr "Felhasználóváltás…"
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Újraindítás"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "Váltás róla: %s…"
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Leállítás"
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "A szoftverek naprakészek"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Kijelentkezés"
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "Frissítések érhetők el…"
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "Újraindítás…"
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "Frissítések telepítése…"
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "Leállítás…"
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr "Újraindítás a frissítés befejezéséhez…"
+#~ msgid "Restart Instead"
+#~ msgstr "Inkább újraindítom"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "Rendszerbeállítások…"
+#~ msgid "Restart Instead…"
+#~ msgstr "Inkább újraindítás…"
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "Kijelzők…"
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr ""
+#~ "Néhány szoftverfrissítés nem kerül alkalmazásra a számítógép következő "
+#~ "újraindításáig."
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "Indítópult…"
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "emiatt van az hogy felhasználóváltás, ne fordítsd 1-re!"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "Csatlakoztatott eszközök"
+#~ msgid "Switch From %s…"
+#~ msgstr "Váltás róla: %s…"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "Nyomtatók"
+#~ msgid "Software Up to Date"
+#~ msgstr "A szoftverek naprakészek"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "Szkennerek"
+#~ msgid "Updates Available…"
+#~ msgstr "Frissítések érhetők el…"
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "Webkamera"
+#~ msgid "Updates Installing…"
+#~ msgstr "Frissítések telepítése…"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Felfüggesztés"
+#~ msgid "Restart to Complete Updates…"
+#~ msgstr "Újraindítás a frissítés befejezéséhez…"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Hibernálás"
+#~ msgid "Displays…"
+#~ msgstr "Kijelzők…"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Vendég-munkamenet"
+#~ msgid "Startup Applications…"
+#~ msgstr "Indítópult…"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "Vendég"
+#~ msgid "Attached Devices"
+#~ msgstr "Csatlakoztatott eszközök"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "Online fiókok…"
+#~ msgid "Printers"
+#~ msgstr "Nyomtatók"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "Felhasználói fiókok…"
+#~ msgid "Scanners"
+#~ msgstr "Szkennerek"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "%s webkamera"
+#~ msgid "Webcam"
+#~ msgstr "Webkamera"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "Szkenner"
+#~ msgid "User Accounts…"
+#~ msgstr "Felhasználói fiókok…"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "%s szkenner"
+#~ msgid "%s Webcam"
+#~ msgstr "%s webkamera"
+
+#~ msgid "Scanner"
+#~ msgstr "Szkenner"
+
+#~ msgid "%s Scanner"
+#~ msgstr "%s szkenner"
 
 #~ msgid "Restart..."
 #~ msgstr "Újraindítás…"
@@ -304,11 +340,6 @@ msgstr "%s szkenner"
 #~ msgid "Restart..."
 #~ msgstr "Újraindítás…"
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Néhány szoftverfrissítés nem kerül alkalmazásra a számítógép következő "
-#~ "újraindításáig."
-
 #~ msgid "Restart Instead..."
 #~ msgstr "Inkább újraindítom…"
 
@@ -325,14 +356,14 @@ msgstr "%s szkenner"
 #~ msgid "Restart to Complete Update"
 #~ msgstr "Újraindítás a frissítés befejezéséhez"
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Váltás róla: %s…"
 
 #~ msgid "Session"
 #~ msgstr "Munkamenet"
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "Az újraindítás gomb nem jelenik meg a munkamenet menüben."
 
 #~ msgid ""
diff --git a/po/hy.po b/po/hy.po
index 890d69b..5196ad0 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2011-03-11 19:11+0000\n"
 "Last-Translator: Serj Safarian <serjsafarian@gmail.com>\n"
 "Language-Team: Armenian <hy@li.org>\n"
+"Language: hy\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,271 +19,235 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
 msgstr ""
+"Ցույց չտալ ելքի հաստատման, վերագործարկի և աշխատանքի ավարտի երկխոսությունը"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
+"Ցույց տալ արդյոք ելքի հաստատման, վերագործարկի և աշխատանքի ավարտի "
+"երկխոսությունը։"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Ընտրացանկից հեռացնել «Ավարտել նիստը» տողը"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Ընտրացանկից հեռացնել «Վերագործարկ» տողը"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
-msgstr "Ընտրացանկից հեռացնել «Անջատել» տողը"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
-msgstr ""
-"Ցույց չտալ ելքի հաստատման, վերագործարկի և աշխատանքի ավարտի երկխոսությունը"
+msgid "Remove the shutdown item from the session menu"
+msgstr "Ընտրացանկից հեռացնել «Անջատել» տողը"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
-"Ցույց տալ արդյոք ելքի հաստատման, վերագործարկի և աշխատանքի ավարտի "
-"երկխոսությունը։"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Կողպել ցուցադրիչը"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Անջատել"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Ելք"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Վերագործարկ"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Ելք..."
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Վերագործարկ..."
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Անջատել..."
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "Ելք"
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "Վերագործարկ"
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
-msgstr "Անջատել"
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
-msgstr "Դուք իրո՞ք կամենում եք փակել բոլոր ծրագրերը և ավարտել ընթացիկ նիստը։"
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
+#: ../src/service.c:594
+msgid "Lock"
 msgstr ""
-"Դուք իրո՞ք կամենում եք փակել բոլոր ծրագրերը և վերագործարկել համակարգիչը։"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
-msgstr "Դուք իրո՞ք կամենում եք փակել բոլոր ծրագրերը և անջատել համակարգիչը։"
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Հյուրական նիստ"
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Ելք..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Ելք"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Վերագործարկ"
-
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Անջատել"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Ընդհատել"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Ելք"
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Ննջել"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
+#: ../src/service.c:722
 msgid "Restart…"
-msgstr ""
+msgstr "Վերագործարկ..."
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "Վերագործարկ"
+
+#: ../src/service.c:729
 msgid "Shut Down…"
-msgstr ""
+msgstr "Անջատել..."
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Գերագործարկել"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr "Անջատել"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
+msgstr "Դուք իրո՞ք կամենում եք փակել բոլոր ծրագրերը և ավարտել ընթացիկ նիստը։"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr "Որոշ թարմացումները կտեղադրվեն միայն համակարգչի վերագործակից հետո։"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
 msgid "Cancel"
 msgstr "Չեղարկել"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "1"
-
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr ""
-
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr ""
-
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr ""
-
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr ""
-
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr ""
-
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr ""
-
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
+"Դուք իրո՞ք կամենում եք փակել բոլոր ծրագրերը և վերագործարկել համակարգիչը։"
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr "Դուք իրո՞ք կամենում եք փակել բոլոր ծրագրերը և անջատել համակարգիչը։"
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr ""
+#~ msgid "Lock Screen"
+#~ msgstr "Կողպել ցուցադրիչը"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Ընդհատել"
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Ելք"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Ննջել"
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Վերագործարկ"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Հյուրական նիստ"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Անջատել"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Ելք"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Վերագործարկ"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Անջատել"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr ""
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Ելք"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr ""
+#~ msgid "Restart Instead"
+#~ msgstr "Գերագործարկել"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr ""
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "1"
 
 #~ msgid "Shut Down..."
 #~ msgstr "Անջատել..."
@@ -310,7 +275,6 @@ msgstr ""
 #~ msgid "Session"
 #~ msgstr "Նիստ"
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Փոխել %s֊ին..."
 
@@ -320,9 +284,6 @@ msgstr ""
 #~ msgid "Restart to Complete Update"
 #~ msgstr "Թարմացումն ավարտելու համար պահանջվում է վերագործարկ"
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr "Որոշ թարմացումները կտեղադրվեն միայն համակարգչի վերագործակից հետո։"
-
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
 #~ msgstr "Ընտրացանկից հեռացնել «Ավարտել նիստը» կոճակը։"
 
@@ -330,5 +291,6 @@ msgstr ""
 #~ "Makes it so that the shutdown button doesn't show in the session menu."
 #~ msgstr "Ընտրացանկից հեռացնել «Անջատել» կոճակը։"
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "Ընտրացանկից հեռացնել «Վերագործարկ» կոճակը։"
diff --git a/po/ia.po b/po/ia.po
new file mode 100644
index 0000000..ca29a28
--- /dev/null
+++ b/po/ia.po
@@ -0,0 +1,204 @@
+# Interlingua translations for PACKAGE package.
+# Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
+"PO-Revision-Date: 2017-07-21 15:41+0200\n"
+"Last-Translator: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n"
+"Language-Team: Interlingua\n"
+"Language: ia\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
+msgid ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
+msgid "Remove the Log Out item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
+msgid "Remove the Restart item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
+msgid "Remove the shutdown item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr ""
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
+msgstr ""
+
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
+
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
+
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
+
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
+
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
+
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
+
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
+
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
+
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
+
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
+
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
+
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
+msgstr ""
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr ""
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr ""
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
+msgid "Log Out"
+msgstr ""
+
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr ""
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr ""
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr ""
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr ""
+
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr ""
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:818
+msgid "Are you sure you want to close all programs and log out?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:819
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
diff --git a/po/id.po b/po/id.po
index 65ec5bb..4886830 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2011-09-05 01:07+0000\n"
 "Last-Translator: Dirgita <Unknown>\n"
 "Language-Team: Indonesian <id@li.org>\n"
+"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,271 +19,275 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
 msgstr ""
+"Menampilkan dialog konfirmasi untuk keluar, menyalakan ulang, dan mematikan "
+"komputer"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
+"Apakah akan menampilkan dialog konfirmasi aksi untuk logout, restart, dan "
+"shutdown."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Menghilangkan opsi Keluar (Log Out) dari menu sesi"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Menghilangkan opsi Hidupkan Ulang (Restart) dari menu sesi"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
 msgid "Remove the shutdown item from the session menu"
 msgstr "Menghilangkan opsi mematikan komputer (shutdown) dari menu sesi"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
-"Menampilkan dialog konfirmasi untuk keluar, menyalakan ulang, dan mematikan "
-"komputer"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"Apakah akan menampilkan dialog konfirmasi aksi untuk logout, restart, dan "
-"shutdown."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "Sesi Tamu Klasik"
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "Menjalankan sesi tamu dengan desktop klasik"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "Tamu"
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Kunci Layar"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Matikan"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Keluar"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Nyalakan Ulang"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "Pengaturan SIstem..."
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Keluar..."
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Nyalakan Ulang..."
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Matikan..."
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "Keluar"
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "Nyalakan Ulang"
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
-msgstr "Matikan"
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
-msgstr "Anda yakin akan menutup semua program dan keluar dari sesi?"
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
-msgstr "Anda yakin akan menutup semua program dan menyalakan ulang komputer?"
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Sesi Tamu"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
-msgstr "Anda yakin akan menutup semua program dan mematikan komputer?"
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Keluar..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Keluar"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Nyalakan Ulang"
-
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Matikan"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Suspensi"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Keluar"
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Hibernasi"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
+#: ../src/service.c:722
 msgid "Restart…"
 msgstr "Nyalakan Ulang..."
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "Nyalakan Ulang"
+
+#: ../src/service.c:729
 msgid "Shut Down…"
 msgstr "Matikan..."
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Nyalakan Ulang Saja"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr "Matikan"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
+msgstr "Anda yakin akan menutup semua program dan keluar dari sesi?"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
 msgstr ""
+"Beberapa pemutakhiran aplikasi tidak diterapkan sebelum komputer dinyalakan "
+"ulang."
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
 msgid "Cancel"
 msgstr "Batal"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "1"
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr "Anda yakin akan menutup semua program dan menyalakan ulang komputer?"
+
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr "Anda yakin akan menutup semua program dan mematikan komputer?"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "Perangkat Lunak Telah Dimutakhirkan"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "Pemutakhiran Tersedia..."
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "Memasang Pemutakhiran..."
+#~ msgid "Classic Guest Session"
+#~ msgstr "Sesi Tamu Klasik"
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr ""
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "Menjalankan sesi tamu dengan desktop klasik"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "Pengaturan SIstem..."
+#~ msgid "Lock Screen"
+#~ msgstr "Kunci Layar"
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Keluar"
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Nyalakan Ulang"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "Perangkat Terhubung"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Matikan"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "Pencetak"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Keluar"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "Pemindai"
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Nyalakan Ulang"
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "Kamera Web"
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Matikan"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Suspensi"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Keluar"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Hibernasi"
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "Nyalakan Ulang..."
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Sesi Tamu"
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "Matikan..."
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "Tamu"
+#~ msgid "Restart Instead"
+#~ msgstr "Nyalakan Ulang Saja"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr ""
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "1"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr ""
+#~ msgid "Software Up to Date"
+#~ msgstr "Perangkat Lunak Telah Dimutakhirkan"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr ""
+#~ msgid "Updates Available…"
+#~ msgstr "Pemutakhiran Tersedia..."
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "Pemindai"
+#~ msgid "Updates Installing…"
+#~ msgstr "Memasang Pemutakhiran..."
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr ""
+#~ msgid "Attached Devices"
+#~ msgstr "Perangkat Terhubung"
+
+#~ msgid "Printers"
+#~ msgstr "Pencetak"
+
+#~ msgid "Scanners"
+#~ msgstr "Pemindai"
+
+#~ msgid "Webcam"
+#~ msgstr "Kamera Web"
+
+#~ msgid "Scanner"
+#~ msgstr "Pemindai"
 
 #~ msgid "Log Out..."
 #~ msgstr "Keluar..."
@@ -293,17 +298,17 @@ msgstr ""
 #~ msgid "Switch User..."
 #~ msgstr "Beralih Pengguna..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Beralih dari %s..."
 
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
 #~ msgstr "Membuat tombol keluar (logout) tidak ditampilkan pada menu sesi."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr ""
-#~ "Membuat tombol untuk menyalakan ulang komputer (restart) tidak ditampilkan "
-#~ "pada menu sesi."
+#~ "Membuat tombol untuk menyalakan ulang komputer (restart) tidak "
+#~ "ditampilkan pada menu sesi."
 
 #~ msgid ""
 #~ "Makes it so that the shutdown button doesn't show in the session menu."
@@ -311,11 +316,6 @@ msgstr ""
 #~ "Membuat tombol untuk mematikan komputer (shutdown) tidak ditampilkan pada "
 #~ "menu sesi."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Beberapa pemutakhiran aplikasi tidak diterapkan sebelum komputer dinyalakan "
-#~ "ulang."
-
 #~ msgid "Restart to Complete Update…"
 #~ msgstr "Nyalakan Ulang Komputer untuk Melengkapi Pemutakhiran..."
 
diff --git a/po/is.po b/po/is.po
index 28df1ca..0737310 100644
--- a/po/is.po
+++ b/po/is.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2011-09-15 09:57+0000\n"
 "Last-Translator: Baldur <baldurpet@gmail.com>\n"
 "Language-Team: Icelandic <is@li.org>\n"
+"Language: is\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,271 +19,262 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
 msgstr ""
+"Ekki láta biðja um staðfestingu þegar notandi skráir sig út, endurræsir "
+"tölvuna eða slekkur á henni."
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
+"Hvort biðja eigi notanda um staðfestingu þegar hann skráir sig út, "
+"endurræsir eða slekkur á tölvunni."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Fjarlægja „Skrá út“ úr valmyndinni"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Fjarlægja „Endurræsa“ úr valmyndinni"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
 msgid "Remove the shutdown item from the session menu"
 msgstr "Fjarlægja „Slökkva á tölvunni“ úr valmyndinni"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
-"Ekki láta biðja um staðfestingu þegar notandi skráir sig út, endurræsir "
-"tölvuna eða slekkur á henni."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"Hvort biðja eigi notanda um staðfestingu þegar hann skráir sig út, "
-"endurræsir eða slekkur á tölvunni."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "Klassísk gestaseta"
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "Hefja gestasetu með venjulega skjáborðsumhverfinu"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Læsa skjánum"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Slökkva á tölvunni"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Skrá út"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Endurræsa"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Skrá út..."
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Endurræsa..."
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Slökkva á..."
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "Skrá út"
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "Endurræsa"
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
-msgstr "Slökkva á tölvunni"
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
-msgstr "Viltu örruglega loka öllum forritum og skrá þig út af tölvunni?"
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
-msgstr "Viltu örugglega loka öllum forritum og endurræsa tölvuna?"
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Gestaaðgangur"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
-msgstr "Viltu örugglega loka öllum forritum og slökkva á tölvunni?"
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Skrá út..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Skrá út"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Endurræsa"
-
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Slökkva á tölvunni"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Svæfa"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Skrá út"
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Leggja í dvala"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
+#: ../src/service.c:722
 msgid "Restart…"
-msgstr ""
+msgstr "Endurræsa..."
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "Endurræsa"
+
+#: ../src/service.c:729
 msgid "Shut Down…"
-msgstr ""
+msgstr "Slökkva á..."
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Endurræsa í staðinn"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr "Slökkva á tölvunni"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
+msgstr "Viltu örruglega loka öllum forritum og skrá þig út af tölvunni?"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr "Sumar uppfærslur taka ekki gildi fyrr en tölvan hefur verið endurræst."
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
 msgid "Cancel"
 msgstr "Hætta við"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "0"
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr "Viltu örugglega loka öllum forritum og endurræsa tölvuna?"
+
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr "Viltu örugglega loka öllum forritum og slökkva á tölvunni?"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "Hugbúnaður er uppfærður"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "Uppfærslur tiltækar..."
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "Verið að setja inn uppfærslur..."
+#~ msgid "Classic Guest Session"
+#~ msgstr "Klassísk gestaseta"
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr ""
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "Hefja gestasetu með venjulega skjáborðsumhverfinu"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr ""
+#~ msgid "Lock Screen"
+#~ msgstr "Læsa skjánum"
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Skrá út"
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Endurræsa"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "Tæki í sambandi"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Slökkva á tölvunni"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "Prentarar"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Skrá út"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "Skannar"
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Endurræsa"
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "Vefmyndavél"
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Slökkva á tölvunni"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Svæfa"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Skrá út"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Leggja í dvala"
+#~ msgid "Restart Instead"
+#~ msgstr "Endurræsa í staðinn"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Gestaaðgangur"
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "0"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr ""
+#~ msgid "Software Up to Date"
+#~ msgstr "Hugbúnaður er uppfærður"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr ""
+#~ msgid "Updates Available…"
+#~ msgstr "Uppfærslur tiltækar..."
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr ""
+#~ msgid "Updates Installing…"
+#~ msgstr "Verið að setja inn uppfærslur..."
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr ""
+#~ msgid "Attached Devices"
+#~ msgstr "Tæki í sambandi"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr ""
+#~ msgid "Printers"
+#~ msgstr "Prentarar"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr ""
+#~ msgid "Scanners"
+#~ msgstr "Skannar"
+
+#~ msgid "Webcam"
+#~ msgstr "Vefmyndavél"
 
 #~ msgid "Restart..."
 #~ msgstr "Endurræsa..."
@@ -300,14 +292,9 @@ msgstr ""
 #~ msgid "Restart..."
 #~ msgstr "Endurræsa..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Sumar uppfærslur taka ekki gildi fyrr en tölvan hefur verið endurræst."
-
 #~ msgid "Restart Instead..."
 #~ msgstr "Endurræsa í staðinn..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Skipta úr %s..."
 
@@ -318,12 +305,14 @@ msgstr ""
 #~ msgid ""
 #~ "Makes it so that the shutdown button doesn't show in the session menu."
 #~ msgstr ""
-#~ "Fjarlægja „Slökkva á tölvunni“-takkann svo hann birtist ekki í valmyndinni."
+#~ "Fjarlægja „Slökkva á tölvunni“-takkann svo hann birtist ekki í "
+#~ "valmyndinni."
 
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
 #~ msgstr "Fjarlægja „Skrá út“-takkann svo hann birtist ekki í valmyndinni."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "Fjarlægja „Endurræsa“-takkann svo hann birtist ekki í valmyndinni."
 
 #~ msgid "Restart to Complete Update…"
diff --git a/po/it.po b/po/it.po
index 0c602e9..2724fae 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2011-09-15 11:01+0000\n"
 "Last-Translator: Milo Casagrande <milo@casagrande.name>\n"
 "Language-Team: Italiano <tp@lists.linux.it>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,277 +20,312 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
 msgstr ""
-"Fa in modo che il pulsante per terminare la sessione non sia mostrato nel "
-"menù sessione."
+"Non visualizza i dialoghi di conferma per azioni di fine sessione, riavvio e "
+"arresto"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-"Fa in modo che il pulsante di riavvio non sia mostrato nel menù sessione."
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
-"Fa in modo che il pulsante di arresto non sia mostrato nel menù sessione."
+"Indica se mostrare o meno i dialoghi di conferma per le azioni di fine "
+"sessione, riavvio e arresto."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Rimuove la voce \"Termina sessione\" dal menù"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+"Fa in modo che il pulsante per terminare la sessione non sia mostrato nel "
+"menù sessione."
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Rimuove la voce \"Riavvia\" dal menù della sessione"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
+"Fa in modo che il pulsante di riavvio non sia mostrato nel menù sessione."
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
 msgid "Remove the shutdown item from the session menu"
 msgstr "Rimuove la voce \"Arresta\" dal menù della sessione"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
-"Non visualizza i dialoghi di conferma per azioni di fine sessione, riavvio e "
-"arresto"
+"Fa in modo che il pulsante di arresto non sia mostrato nel menù sessione."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"Indica se mostrare o meno i dialoghi di conferma per le azioni di fine "
-"sessione, riavvio e arresto."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "Sessione ospite classica"
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "Avvia una sessione ospite che fa uso del desktop classico"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "Ospite"
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Blocca schermo"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Arresta"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Termina sessione"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Riavvia"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "Impostazioni di sistema..."
+
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "Account online..."
+
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
+
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "Cambia utente..."
+
+#: ../src/service.c:575 ../src/service.c:591
+#, fuzzy
+msgid "Switch Account"
+msgstr "Cambia utente..."
+
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "Cambia utente..."
+
+#: ../src/service.c:588
+#, fuzzy
+msgid "Lock/Switch Account"
+msgstr "Cambia utente..."
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Sessione ospite"
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
+#: ../src/service.c:696
 msgid "Log Out…"
 msgstr "Termina sessione..."
 
-#: ../src/settings-helper.c:89
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
+msgid "Log Out"
+msgstr "Termina sessione"
+
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Sospendi"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Iberna"
+
+#: ../src/service.c:722
 msgid "Restart…"
 msgstr "Riavvia…"
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "Riavvia"
+
+#: ../src/service.c:729
 msgid "Shut Down…"
 msgstr "Arresta..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "Terminare la sessione"
-
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "Riavviare il sistema"
-
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
-msgstr "Arrestare"
+msgstr "Arresta"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr "Chiudere tutti i programmi e terminare la sessione?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+"Alcuni aggiornamenti non verranno applicati fino al prossimo riavvio del "
+"computer."
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "Annulla"
+
+#: ../src/backend-dbus/actions.c:862
 msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr "Chiudere tutti i programmi e riavviare il computer?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr "Chiudere tutti i programmi e arrestare il computer?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "Termina sessione"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Riavvia"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Arresta"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Termina sessione"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr "Riavvia..."
+#~ msgid "Classic Guest Session"
+#~ msgstr "Sessione ospite classica"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr "Arresta..."
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "Avvia una sessione ospite che fa uso del desktop classico"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Riavvia subito"
+#~ msgid "Lock Screen"
+#~ msgstr "Blocca schermo"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "Riavvia subito..."
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Terminare la sessione"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
-"Alcuni aggiornamenti software non saranno applicati prima del prossimo "
-"riavvio del computer."
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Riavviare il sistema"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "Annulla"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Arrestare"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "0"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Termina sessione"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr "Cambia utente..."
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Riavvia"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "Cambia da %s..."
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Arresta"
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "Aggiorna software"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Termina sessione"
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "Aggiornamenti disponibili..."
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "Riavvia..."
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "Installazione software..."
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "Arresta..."
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr "Riavvia per completare aggiornamenti..."
+#~ msgid "Restart Instead"
+#~ msgstr "Riavvia subito"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "Impostazioni di sistema..."
+#~ msgid "Restart Instead…"
+#~ msgstr "Riavvia subito..."
+
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr ""
+#~ "Alcuni aggiornamenti software non saranno applicati prima del prossimo "
+#~ "riavvio del computer."
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "Monitor..."
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "0"
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "Applicazioni d'avvio..."
+#~ msgid "Switch From %s…"
+#~ msgstr "Cambia da %s..."
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "Dispositivi collegati"
+#~ msgid "Software Up to Date"
+#~ msgstr "Aggiorna software"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "Stampanti"
+#~ msgid "Updates Available…"
+#~ msgstr "Aggiornamenti disponibili..."
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "Scanner"
+#~ msgid "Updates Installing…"
+#~ msgstr "Installazione software..."
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "Webcam"
+#~ msgid "Restart to Complete Updates…"
+#~ msgstr "Riavvia per completare aggiornamenti..."
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Sospendi"
+#~ msgid "Displays…"
+#~ msgstr "Monitor..."
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Iberna"
+#~ msgid "Startup Applications…"
+#~ msgstr "Applicazioni d'avvio..."
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Sessione ospite"
+#~ msgid "Attached Devices"
+#~ msgstr "Dispositivi collegati"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "Ospite"
+#~ msgid "Printers"
+#~ msgstr "Stampanti"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "Account online..."
+#~ msgid "Scanners"
+#~ msgstr "Scanner"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "Account utente..."
+#~ msgid "Webcam"
+#~ msgstr "Webcam"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "Webcam %s"
+#~ msgid "User Accounts…"
+#~ msgstr "Account utente..."
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "Scanner"
+#~ msgid "%s Webcam"
+#~ msgstr "Webcam %s"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "Scanner %s"
+#~ msgid "Scanner"
+#~ msgstr "Scanner"
+
+#~ msgid "%s Scanner"
+#~ msgstr "Scanner %s"
 
 #~ msgid "Log Out..."
 #~ msgstr "Termina sessione..."
@@ -307,28 +343,23 @@ msgstr "Scanner %s"
 #~ msgid "Restart..."
 #~ msgstr "Riavvia..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Alcuni aggiornamenti non verranno applicati fino al prossimo riavvio del "
-#~ "computer."
-
 #~ msgid "Restart Instead..."
 #~ msgstr "Riavvia subito..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Cambia da %s..."
 
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
 #~ msgstr ""
-#~ "Fa in modo che il pulsante per terminare la sessione non venga mostrato nel "
-#~ "menù."
+#~ "Fa in modo che il pulsante per terminare la sessione non venga mostrato "
+#~ "nel menù."
 
 #~ msgctxt "button auth"
 #~ msgid "Shut Down..."
 #~ msgstr "Arresta..."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr ""
 #~ "Fa in modo che il pulsante per riavviare il computer non compaia nel menù "
 #~ "della sessione."
diff --git a/po/ja.po b/po/ja.po
index a7a6383..7173c38 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2011-09-21 03:48+0000\n"
 "Last-Translator: Fumihito YOSHIDA <hito@kugutsu.org>\n"
 "Language-Team: Japanese\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,267 +19,308 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr "ログアウトボタンをセッションメニューから隠します。"
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr "ログアウト、再起動、シャットダウン時に確認ダイアログを表示しない"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr "再起動ボタンをセッションメニューから隠します。"
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
-msgstr "シャットダウンボタンをセッションメニューから隠します。"
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+"ログアウト、再起動、およびシャットダウン操作の実行時に確認ダイアログを表示す"
+"るかどうかを指定します。"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "セッションメニューから「ログアウト」を削除"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr "ログアウトボタンをセッションメニューから隠します。"
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "セッションメニューから「再起動」を削除"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
-msgstr "セッションメニューからシャットダウンを削除"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr "再起動ボタンをセッションメニューから隠します。"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
-msgstr "ログアウト、再起動、シャットダウン時に確認ダイアログを表示しない"
+msgid "Remove the shutdown item from the session menu"
+msgstr "セッションメニューからシャットダウンを削除"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
-msgstr "ログアウト、再起動、およびシャットダウン操作の実行時に確認ダイアログを表示するかどうかを指定します。"
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr "シャットダウンボタンをセッションメニューから隠します。"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "クラシック・ゲストセッション"
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
+msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "クラシックデスクトップを使用してゲストセッションを開始します"
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "コンピューターのロック"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "ゲスト"
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "シャットダウン"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "ログアウト"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "再起動"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "ログアウト…"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "システム設定..."
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "再起動…"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "オンラインアカウントの設定..."
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "シャットダウン…"
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
+
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "ユーザーアカウントの切り替え..."
+
+#: ../src/service.c:575 ../src/service.c:591
+#, fuzzy
+msgid "Switch Account"
+msgstr "ユーザーアカウントの切り替え..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "ユーザーアカウントの切り替え..."
+
+#: ../src/service.c:588
+#, fuzzy
+msgid "Lock/Switch Account"
+msgstr "ユーザーアカウントの切り替え..."
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "ゲストセッション"
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "ログアウト…"
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "ログアウト"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "サスペンド"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "ハイバネート"
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr "再起動…"
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
 msgid "Restart"
 msgstr "再起動"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr "シャットダウン…"
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
 msgstr "シャットダウン"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
+msgstr ""
+"本当にすべてのプログラムを終了し、コンピューターからログアウトしますか?"
+
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
 msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
-msgstr "本当にすべてのプログラムを終了し、コンピューターからログアウトしますか?"
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+"適用されたソフトウェアアップデートの中に、コンピューターを再起動するまで有効"
+"にならないものがあります。"
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "キャンセル"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
+#: ../src/backend-dbus/actions.c:862
 msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr "本当にすべてのプログラムを終了し、コンピューターを再起動させますか?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr ""
+"本当にすべてのプログラムを終了し、コンピューターをシャットダウンしますか?"
+
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1008
 msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
-msgstr "本当にすべてのプログラムを終了し、コンピューターをシャットダウンしますか?"
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "ログアウト"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "再起動"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "シャットダウン"
+#~ msgid "Classic Guest Session"
+#~ msgstr "クラシック・ゲストセッション"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "ログアウト"
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "クラシックデスクトップを使用してゲストセッションを開始します"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr "再起動…"
+#~ msgid "Lock Screen"
+#~ msgstr "コンピューターのロック"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr "シャットダウン…"
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "ログアウト"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "代わりに再起動"
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "再起動"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "代わりに再起動..."
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "シャットダウン"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr "一部のソフトウェアアップデートは、コンピューターを再起動するまで適用されません。"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "ログアウト"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "キャンセル"
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "再起動"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "1"
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "シャットダウン"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr "ユーザーアカウントの切り替え..."
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "ログアウト"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "%s から切り替え…"
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "再起動…"
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "ソフトウェアは最新状態です"
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "シャットダウン…"
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "アップデートがあります…"
+#~ msgid "Restart Instead"
+#~ msgstr "代わりに再起動"
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "アップデートのインストール中..."
+#~ msgid "Restart Instead…"
+#~ msgstr "代わりに再起動..."
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr "再起動（アップデートの完全な適用に必須）…"
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr ""
+#~ "一部のソフトウェアアップデートは、コンピューターを再起動するまで適用されま"
+#~ "せん。"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "システム設定..."
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "1"
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "モニタの設定…"
+#~ msgid "Switch From %s…"
+#~ msgstr "%s から切り替え…"
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "自動起動するアプリケーション..."
+#~ msgid "Software Up to Date"
+#~ msgstr "ソフトウェアは最新状態です"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "接続されているデバイス"
+#~ msgid "Updates Available…"
+#~ msgstr "アップデートがあります…"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "プリンター"
+#~ msgid "Updates Installing…"
+#~ msgstr "アップデートのインストール中..."
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "スキャナー"
+#~ msgid "Restart to Complete Updates…"
+#~ msgstr "再起動（アップデートの完全な適用に必須）…"
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "ウェブカメラ"
+#~ msgid "Displays…"
+#~ msgstr "モニタの設定…"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "サスペンド"
+#~ msgid "Startup Applications…"
+#~ msgstr "自動起動するアプリケーション..."
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "ハイバネート"
+#~ msgid "Attached Devices"
+#~ msgstr "接続されているデバイス"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "ゲストセッション"
+#~ msgid "Printers"
+#~ msgstr "プリンター"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "ゲスト"
+#~ msgid "Scanners"
+#~ msgstr "スキャナー"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "オンラインアカウントの設定..."
+#~ msgid "Webcam"
+#~ msgstr "ウェブカメラ"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "ユーザーアカウントの設定…"
+#~ msgid "User Accounts…"
+#~ msgstr "ユーザーアカウントの設定…"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "%s ウェブカメラ"
+#~ msgid "%s Webcam"
+#~ msgstr "%s ウェブカメラ"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "スキャナー"
+#~ msgid "Scanner"
+#~ msgstr "スキャナー"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "%s スキャナー"
+#~ msgid "%s Scanner"
+#~ msgstr "%s スキャナー"
 
 #~ msgid "Restart..."
 #~ msgstr "再起動..."
@@ -303,12 +345,14 @@ msgstr "%s スキャナー"
 #~ msgid "Shut Down..."
 #~ msgstr "シャットダウン..."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "セッションメニューに再起動ボタンを表示させないようにします。"
 
 #~ msgid ""
 #~ "Makes it so that the shutdown button doesn't show in the session menu."
-#~ msgstr "セッションメニューにシャットダウンボタンを表示させないようにします。"
+#~ msgstr ""
+#~ "セッションメニューにシャットダウンボタンを表示させないようにします。"
 
 #~ msgid "Restart to Complete Update…"
 #~ msgstr "再起動（アップデート完了には必須）…"
@@ -322,9 +366,5 @@ msgstr "%s スキャナー"
 #~ msgid "Session"
 #~ msgstr "セッション"
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "ユーザー %s から切り替え..."
-
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr "適用されたソフトウェアアップデートの中に、コンピューターを再起動するまで有効にならないものがあります。"
diff --git a/po/ka.po b/po/ka.po
index 3a39f2f..0273b37 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2011-03-26 17:00+0000\n"
 "Last-Translator: Giorgi Maghlakelidze <acidlabz@gmail.com>\n"
 "Language-Team: Georgian <ka@li.org>\n"
+"Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,278 +19,244 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr ""
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr "გასვლის, გადატვირთვისა და გათიშვის დადასტურების დიალოგის უგულებელყოფა"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
+"გასვლის, გადატვირთვისა და გათიშვის დადასტურების ფაჯრის ჩვენება თუ დამალვა."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "ანგარიშიდან გასვლის ღილაკის ამოღება სესიის მენიუდან"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "გადატვირთვის ღილაკის ამოღება სესიის მენიუდან"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
-msgstr "გათიშვის ღილაკის ამოღება სესიის მენიუდან"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
-msgstr ""
-"გასვლის, გადატვირთვისა და გათიშვის დადასტურების დიალოგის უგულებელყოფა"
+msgid "Remove the shutdown item from the session menu"
+msgstr "გათიშვის ღილაკის ამოღება სესიის მენიუდან"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
-"გასვლის, გადატვირთვისა და გათიშვის დადასტურების ფაჯრის ჩვენება თუ დამალვა."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "ეკრანის ჩაკეტვა"
-
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "გათიშვა"
-
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "ანგარიშიდან გასვლა"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "გადატვირთვა"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "გასვლა..."
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "გადატვირთვა..."
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "გათიშვა..."
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "ანგარიშიდან გასვლა"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "კომპიუტერის გადატვირთვა"
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
-msgstr "კომპიუტერის გათიშვა"
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
 msgstr ""
-"დარწმუნებული ხართ, რომ გსურთ ყველა პროგრამის დახურვა და ანგარიშიდან გასვლა?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
 msgstr ""
-"დარწმუნებული ხართ, რომ გსურთ ყველა პროგრამის დახურვა და კომპიუტერის "
-"გადატვირთვა?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
 msgstr ""
-"დარწმუნებული ხართ, რომ გსურთ ყველა პროგრამის დახურვა და კომპიუტერის გათიშვა?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "გასვლა"
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "გადატვირთვა"
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "სასტუმრო სესია"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "გათიშვა"
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "გასვლა..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
-msgstr "გასვლა"
+msgstr "ანგარიშიდან გასვლა"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "ძილის რეჟიმი"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "ჰიბერნაცია"
+
+#: ../src/service.c:722
 msgid "Restart…"
-msgstr ""
+msgstr "გადატვირთვა..."
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "გადატვირთვა"
+
+#: ../src/service.c:729
 msgid "Shut Down…"
-msgstr ""
+msgstr "გათიშვა..."
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "გადატვირთვა ამის მაგივრად"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr "გათიშვა"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr ""
+"დარწმუნებული ხართ, რომ გსურთ ყველა პროგრამის დახურვა და ანგარიშიდან გასვლა?"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
 msgstr ""
+"ზოგიერთი პროგრამული განახლება არ დაყენდება სანამ არ მოხდება კომპიუტერის "
+"გადატვირთვა."
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
 msgid "Cancel"
 msgstr "გაუქმება"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "0"
-
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr ""
-
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr ""
-
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr ""
-
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr ""
-
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr ""
-
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr ""
-
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
+"დარწმუნებული ხართ, რომ გსურთ ყველა პროგრამის დახურვა და კომპიუტერის "
+"გადატვირთვა?"
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
+"დარწმუნებული ხართ, რომ გსურთ ყველა პროგრამის დახურვა და კომპიუტერის გათიშვა?"
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr ""
+#~ msgid "Lock Screen"
+#~ msgstr "ეკრანის ჩაკეტვა"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "ძილის რეჟიმი"
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "ანგარიშიდან გასვლა"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "ჰიბერნაცია"
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "კომპიუტერის გადატვირთვა"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "სასტუმრო სესია"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "კომპიუტერის გათიშვა"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "გასვლა"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "გადატვირთვა"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "გათიშვა"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr ""
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "გასვლა"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr ""
+#~ msgid "Restart Instead"
+#~ msgstr "გადატვირთვა ამის მაგივრად"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr ""
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "0"
 
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
 #~ msgstr "ანგარიშიდან გასვლის ღილაკი აღარ გამოჩნდება სესიის მენიუში."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "კომპიუტერის გადატვირთვის ღილაკი აღარ გამოჩნდება სესიის მენიუში."
 
 #~ msgid ""
@@ -309,11 +276,6 @@ msgstr ""
 #~ msgid "Shut Down..."
 #~ msgstr "გათიშვა..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "ზოგიერთი პროგრამული განახლება არ დაყენდება სანამ არ მოხდება კომპიუტერის "
-#~ "გადატვირთვა."
-
 #~ msgid "Restart Instead..."
 #~ msgstr "გადატვირთვა ამის მაგივრად..."
 
@@ -327,7 +289,6 @@ msgstr ""
 #~ msgid "Session"
 #~ msgstr "სესია"
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "გადართვა %s-დან..."
 
diff --git a/po/kk.po b/po/kk.po
index 5bd85e5..45e6596 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2011-09-15 11:36+0000\n"
 "Last-Translator: jmb_kz <Unknown>\n"
 "Language-Team: Kazakh <kk@li.org>\n"
+"Language: kk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,277 +19,310 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
 msgstr ""
-"Сеанстар мәзірінен \"Сеанстан шығу\" жолын алып тастауға мүмкіндік береді."
+"Компьютерді сөндіруге немесе қайта жүктеуге жіберген кезде растау диалогын "
+"көрсетпеу"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgid ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
-"Сеанстар мәзірінен \"Қайта жүктеу\" жолын алып тастауға мүмкіндік береді."
+"Компьютерді сөндіруге немесе қайта жүктеуге жіберген кезде растау диалогын "
+"көрсету қажет пе?"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
-msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
-msgstr "Сеанстар мәзірінен \"Сөндіру\" жолын алып тастауға мүмкіндік береді."
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
 msgid "Remove the Log Out item from the session menu"
 msgstr "Сеанстар мәзірінен \"Сеанстан шығу\" жолын алып тастау"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+"Сеанстар мәзірінен \"Сеанстан шығу\" жолын алып тастауға мүмкіндік береді."
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Сеанстар мәзірінен \"Қайта жүктеу\" жолын алып тастау"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
+"Сеанстар мәзірінен \"Қайта жүктеу\" жолын алып тастауға мүмкіндік береді."
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
 msgid "Remove the shutdown item from the session menu"
 msgstr "Сеанстар мәзірінен \"Сөндіру\" жолын алып тастау"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr "Сеанстар мәзірінен \"Сөндіру\" жолын алып тастауға мүмкіндік береді."
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"Компьютерді сөндіруге немесе қайта жүктеуге жіберген кезде растау диалогын "
-"көрсетпеу"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
-"Компьютерді сөндіруге немесе қайта жүктеуге жіберген кезде растау диалогын "
-"көрсету қажет пе?"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "Классикалық қонақты сессия"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "Қонақ"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "Классикалық жұмыс үстелі бар қонақты сессия бастау"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Экранды бөгеттеу"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Сөндіру"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Сеанстан шығу"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "Жүйе баптаулары..."
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Қайта жүктеу"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "Онлайн/желілік тіркемелері..."
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Сеанстан шығу..."
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Қайта жүктеу..."
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "Пайдаланушы ауыстыру..."
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Сөндіру..."
+#: ../src/service.c:575 ../src/service.c:591
+#, fuzzy
+msgid "Switch Account"
+msgstr "Пайдаланушы ауыстыру..."
+
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "Пайдаланушы ауыстыру..."
+
+#: ../src/service.c:588
+#, fuzzy
+msgid "Lock/Switch Account"
+msgstr "Пайдаланушы ауыстыру..."
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Қонақты сеанс"
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Сеанстан шығу..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Сеанстан шығу"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Қалғу"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Ұйықтау"
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr "Қайта жүктеу..."
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
 msgid "Restart"
 msgstr "Қайта жүктеу"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr "Сөндіру..."
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
 msgstr "Сөндіру"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr ""
 "Барлық бағдарламаларды жауып, компьютеріңіздегі сеанстан шығуды қалайсыз ба?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr "Кейбір жаңартулар компьютеріңіз қайта жүктелмегенше іске асырылмайды."
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "Болдырмау"
+
+#: ../src/backend-dbus/actions.c:862
 msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
 "Барлық бағдарламаларды жауып, компьютеріңізді қайта жүктеуді қалайсыз ба?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr "Барлық бағдарламаларды жауып, компьютеріңізді сөндіруді қалайсыз ба?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "Сеанстан шығу"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Қайта жүктеу"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Сөндіру"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Сеанстан шығу"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr "Қайта жүктеу..."
+#~ msgid "Classic Guest Session"
+#~ msgstr "Классикалық қонақты сессия"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr "Сөндіру..."
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "Классикалық жұмыс үстелі бар қонақты сессия бастау"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Қайта жүктеу"
+#~ msgid "Lock Screen"
+#~ msgstr "Экранды бөгеттеу"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "Қайта жүктеу..."
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Сеанстан шығу"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
-"Кейбір бағдарлама жаңартулары тек компьютер қайта жүктелгеннен кейін ғана "
-"іске асырылады."
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Қайта жүктеу"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "Болдырмау"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Сөндіру"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "0"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Сеанстан шығу"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr "Пайдаланушы ауыстыру..."
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Қайта жүктеу"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "%s пайдаланушысынан ауысу..."
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Сөндіру"
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "Бағдарламалық қамтамасыздандыру актуальды күйде"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Сеанстан шығу"
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "Жаңартулар жетімді..."
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "Қайта жүктеу..."
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "Жаңартулар орнатылуда..."
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "Сөндіру..."
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr "Жаңартуды аяқтау үшін компьютерді қайта жүктеңіз..."
+#~ msgid "Restart Instead"
+#~ msgstr "Қайта жүктеу"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "Жүйе баптаулары..."
+#~ msgid "Restart Instead…"
+#~ msgstr "Қайта жүктеу..."
+
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr ""
+#~ "Кейбір бағдарлама жаңартулары тек компьютер қайта жүктелгеннен кейін ғана "
+#~ "іске асырылады."
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "Мониторлар..."
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "0"
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "Жүйеге кірген кезде автоматты түрде ашылатын бағдарламалар..."
+#~ msgid "Switch From %s…"
+#~ msgstr "%s пайдаланушысынан ауысу..."
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "Қосылған құрылғылар"
+#~ msgid "Software Up to Date"
+#~ msgstr "Бағдарламалық қамтамасыздандыру актуальды күйде"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "Принтерлер"
+#~ msgid "Updates Available…"
+#~ msgstr "Жаңартулар жетімді..."
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "Сканерлер"
+#~ msgid "Updates Installing…"
+#~ msgstr "Жаңартулар орнатылуда..."
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "Вебкамера"
+#~ msgid "Restart to Complete Updates…"
+#~ msgstr "Жаңартуды аяқтау үшін компьютерді қайта жүктеңіз..."
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Қалғу"
+#~ msgid "Displays…"
+#~ msgstr "Мониторлар..."
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Ұйықтау"
+#~ msgid "Startup Applications…"
+#~ msgstr "Жүйеге кірген кезде автоматты түрде ашылатын бағдарламалар..."
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Қонақты сеанс"
+#~ msgid "Attached Devices"
+#~ msgstr "Қосылған құрылғылар"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "Қонақ"
+#~ msgid "Printers"
+#~ msgstr "Принтерлер"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "Онлайн/желілік тіркемелері..."
+#~ msgid "Scanners"
+#~ msgstr "Сканерлер"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "Пайдаланушы тіркемелері..."
+#~ msgid "Webcam"
+#~ msgstr "Вебкамера"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "%s веб-камерасы"
+#~ msgid "User Accounts…"
+#~ msgstr "Пайдаланушы тіркемелері..."
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "Сканер"
+#~ msgid "%s Webcam"
+#~ msgstr "%s веб-камерасы"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "%s сканері"
+#~ msgid "Scanner"
+#~ msgstr "Сканер"
+
+#~ msgid "%s Scanner"
+#~ msgstr "%s сканері"
 
 #~ msgid "Shut Down..."
 #~ msgstr "Сөндіру..."
@@ -296,10 +330,6 @@ msgstr "%s сканері"
 #~ msgid "Log Out..."
 #~ msgstr "Сеанстан шығу..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Кейбір жаңартулар компьютеріңіз қайта жүктелмегенше іске асырылмайды."
-
 #~ msgid "Restart Instead..."
 #~ msgstr "Қайта жүктеу..."
 
@@ -308,7 +338,6 @@ msgstr "%s сканері"
 #~ "Сеанстар мәзірінен \"Сеанстан шығу\" жолын алып тастайтындай әрекеттерді "
 #~ "орындайды."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "%s пайдаланушысынан ауысу..."
 
@@ -323,7 +352,8 @@ msgstr "%s сканері"
 #~ msgid "Restart..."
 #~ msgstr "Қайта жүктеу..."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr ""
 #~ "Сеанстар мәзірінен \"Қайта жүктеу\" жолын алып тастайтындай әрекеттерді "
 #~ "орындайды."
@@ -331,7 +361,8 @@ msgstr "%s сканері"
 #~ msgid ""
 #~ "Makes it so that the shutdown button doesn't show in the session menu."
 #~ msgstr ""
-#~ "Сеанстар мәзірінен \"Сөндіру\" жолын алып тастайтындай әрекеттерді орындайды."
+#~ "Сеанстар мәзірінен \"Сөндіру\" жолын алып тастайтындай әрекеттерді "
+#~ "орындайды."
 
 #~ msgid "Restart to Complete Update"
 #~ msgstr "Жаңартуды аяқтау үшін компьютерді қайта жүктеңіз"
diff --git a/po/kl.po b/po/kl.po
new file mode 100644
index 0000000..3eea469
--- /dev/null
+++ b/po/kl.po
@@ -0,0 +1,204 @@
+# Kalaallisut translations for PACKAGE package.
+# Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
+"PO-Revision-Date: 2017-07-21 15:41+0200\n"
+"Last-Translator: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n"
+"Language-Team: Kalaallisut\n"
+"Language: kl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
+msgid ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
+msgid "Remove the Log Out item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
+msgid "Remove the Restart item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
+msgid "Remove the shutdown item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr ""
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
+msgstr ""
+
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
+
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
+
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
+
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
+
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
+
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
+
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
+
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
+
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
+
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
+
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
+
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
+msgstr ""
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr ""
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr ""
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
+msgid "Log Out"
+msgstr ""
+
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr ""
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr ""
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr ""
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr ""
+
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr ""
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:818
+msgid "Are you sure you want to close all programs and log out?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:819
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
diff --git a/po/km.po b/po/km.po
index 6cbeefa..aae12bc 100644
--- a/po/km.po
+++ b/po/km.po
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2010-10-11 15:15+0000\n"
 "Last-Translator: ពៅ សុភា <Unknown>\n"
 "Language-Team: Khmer <km@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,270 +19,231 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr ""
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr "កុំបង្ហាញសំណួរបញ្ជាក់នៅពេល ចេញពីប្រព័ន្ធ, បើកម៉ាស៊ីនឡើងវិញ និង បិទម៉ាស៊ីន"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
-msgstr ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr "បង្ហាញសំណួរបញ្ជាក់នៅពេល ចេញពីប្រព័ន្ធ, បើកម៉ាស៊ីនឡើងវិញ និង បិទម៉ាស៊ីន ឬក៏អត់ ។"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "លុបប៊ូតុង\"ចេញពីប្រព័ន្ធ\"ពីបញ្ជីវគ្គ"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "លុបប៊ូតុង\"បើកម៉ាស៊ីនឡើងវិញ\"ពីបញ្ជីវគ្គ"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
 msgid "Remove the shutdown item from the session menu"
 msgstr "លុបប៊ូតុង\"បិទម៉ាស៊ីន\"ពីបញ្ជីវគ្គ"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
-"កុំបង្ហាញសំណួរបញ្ជាក់នៅពេល ចេញពីប្រព័ន្ធ, បើកម៉ាស៊ីនឡើងវិញ និង បិទម៉ាស៊ីន"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"បង្ហាញសំណួរបញ្ជាក់នៅពេល ចេញពីប្រព័ន្ធ, បើកម៉ាស៊ីនឡើងវិញ និង បិទម៉ាស៊ីន "
-"ឬក៏អត់ ។"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
+#: ../src/service.c:325
+msgid "Guest"
 msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "ចាក់សោ"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "បិទម៉ាស៊ីន"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "ចេញពីប្រព័ន្ធ"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "បើកម៉ាស៊ីនឡើងវិញ"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "ចេញពីប្រព័ន្ធ..."
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "បើកម៉ាស៊ីនឡើងវិញ..."
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "បិទម៉ាស៊ីន..."
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "ចេញពីប្រព័ន្ធ"
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "បើកម៉ាស៊ីនឡើងវិញ"
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
-msgstr "បិទម៉ាស៊ីន"
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
-msgstr "តើអ្នកពិតជាចង់បិទកម្មវិធីទាំងអស់ រួចចេញពីប្រព័ន្ធមែនទេ ?"
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
-msgstr "តើអ្នកពិតជាចង់បិទកម្មវិធីទាំងអស់ រួចបើកម៉ាស៊ីនឡើងវិញមែនទេ ?"
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "វគ្គភ្ញៀវ"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
-msgstr "តើអ្នកពិតជាចង់បិទកម្មវិធីទាំងអស់ រួចបិទម៉ាស៊ីនមែនទេ ?"
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "ចេញពីប្រព័ន្ធ..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "ចេញពីប្រព័ន្ធ"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "បើកម៉ាស៊ីនឡើងវិញ"
-
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "បិទម៉ាស៊ីន"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "ដេក"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "ចេញពីប្រព័ន្ធ"
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "ដេកយូរ"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
+#: ../src/service.c:722
 msgid "Restart…"
-msgstr ""
+msgstr "បើកម៉ាស៊ីនឡើងវិញ..."
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "បើកម៉ាស៊ីនឡើងវិញ"
+
+#: ../src/service.c:729
 msgid "Shut Down…"
-msgstr ""
+msgstr "បិទម៉ាស៊ីន..."
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "សូមបើកម៉ាស៊ីនឡើងវិញ"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr "បិទម៉ាស៊ីន"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
+msgstr "តើអ្នកពិតជាចង់បិទកម្មវិធីទាំងអស់ រួចចេញពីប្រព័ន្ធមែនទេ ?"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr "បន្ទាន់សម័យចំពោះកម្មវិធីខ្លះមិនទាន់ប្រើបាននៅឡើយទេ លុះត្រាតែអ្នកបើកម៉ាស៊ីនឡើងវិញ ។"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
 msgid "Cancel"
 msgstr "បោះបង់"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "ប្ដូរអ្នកប្រើពី %s..."
-
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr ""
-
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr ""
-
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr ""
-
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr ""
-
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr "តើអ្នកពិតជាចង់បិទកម្មវិធីទាំងអស់ រួចបើកម៉ាស៊ីនឡើងវិញមែនទេ ?"
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr "តើអ្នកពិតជាចង់បិទកម្មវិធីទាំងអស់ រួចបិទម៉ាស៊ីនមែនទេ ?"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr ""
+#~ msgid "Lock Screen"
+#~ msgstr "ចាក់សោ"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "ចេញពីប្រព័ន្ធ"
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "បើកម៉ាស៊ីនឡើងវិញ"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "ដេក"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "បិទម៉ាស៊ីន"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "ដេកយូរ"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "ចេញពីប្រព័ន្ធ"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "វគ្គភ្ញៀវ"
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "បើកម៉ាស៊ីនឡើងវិញ"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr ""
-
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "បិទម៉ាស៊ីន"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr ""
-
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr ""
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "ចេញពីប្រព័ន្ធ"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr ""
+#~ msgid "Restart Instead"
+#~ msgstr "សូមបើកម៉ាស៊ីនឡើងវិញ"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr ""
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "ប្ដូរអ្នកប្រើពី %s..."
 
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
 #~ msgstr "កុំបង្ហាញប៊ូតុង\"ចេញពីប្រព័ន្ធ\"ក្នុងបញ្ជីវគ្គ"
@@ -290,7 +252,8 @@ msgstr ""
 #~ "Makes it so that the shutdown button doesn't show in the session menu."
 #~ msgstr "កុំបង្ហាញប៊ូតុង\"បិទម៉ាស៊ីន\"ក្នុងបញ្ជីវគ្គ"
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "កុំបង្ហាញប៊ូតុង\"បើកម៉ាស៊ីនឡើងវិញ\"ក្នុងបញ្ជីវគ្គ"
 
 #~ msgid "Shut Down..."
@@ -309,11 +272,6 @@ msgstr ""
 #~ msgid "Shut Down..."
 #~ msgstr "បិទម៉ាស៊ីន..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "បន្ទាន់សម័យចំពោះកម្មវិធីខ្លះមិនទាន់ប្រើបាននៅឡើយទេ "
-#~ "លុះត្រាតែអ្នកបើកម៉ាស៊ីនឡើងវិញ ។"
-
 #~ msgctxt "button auth"
 #~ msgid "Restart..."
 #~ msgstr "បើកម៉ាស៊ីនឡើងវិញ..."
@@ -321,7 +279,6 @@ msgstr ""
 #~ msgid "Switch User..."
 #~ msgstr "ប្ដូរអ្នកប្រើ..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "ប្ដូរអ្នកប្រើពី %s..."
 
diff --git a/po/kn.po b/po/kn.po
index 7e3637c..7898da6 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2011-03-30 07:51+0000\n"
 "Last-Translator: Sadashiv <Unknown>\n"
 "Language-Team: Kannada <kn@li.org>\n"
+"Language: kn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,286 +19,238 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr ""
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr "ನಿರ್ಗಮ, ಪುನರಾರಂಭ, ಸ್ಥಬ್ಧಗೊಳಿಸಲು ಆಯ್ಕೆ ಖಚಿತಗೊಳಿಸಲು ಮರುಪ್ರಶ್ನೆ ಬರದಂತಾಗಿಸು."
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
+"ನಿರ್ಗಮ, ಪುನರಾರಂಭ, ಸ್ಥಬ್ಧಗೊಳಿಸಲು ಆಯ್ಕೆ ಖಚಿತಗೊಳಿಸಲು ಮರುಪ್ರಶ್ನೆಗಳನ್ನು ಮೂಡುವಂತಾಗಿಸಬೇಕೊ "
+"ಅಥವಾ ಬೇಡವೊ."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "ಅಧಿವೇಶನ ಮೆನೂವಿನಿಂದ 'ಲಾಗ್‌ಔಟ್' ಆಯ್ಕೆಯನ್ನು ತೆಗೆ."
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "ಅಧಿವೇಶನ ಮೆನೂವಿನಿಂದ 'ಪುನರಾರಂಭ' ಆಯ್ಕೆಯನ್ನು ತೆಗೆ."
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
-msgstr "ಅಧಿವೇಶನ ಮೆನೂವಿನಿಂದ 'ಸ್ಥಬ್ಧಗೊಳಿಸು' ಆಯ್ಕೆಯನ್ನು ತೆಗೆ."
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
-msgstr ""
-"ನಿರ್ಗಮ, ಪುನರಾರಂಭ, ಸ್ಥಬ್ಧಗೊಳಿಸಲು ಆಯ್ಕೆ ಖಚಿತಗೊಳಿಸಲು ಮರುಪ್ರಶ್ನೆ ಬರದಂತಾಗಿಸು."
+msgid "Remove the shutdown item from the session menu"
+msgstr "ಅಧಿವೇಶನ ಮೆನೂವಿನಿಂದ 'ಸ್ಥಬ್ಧಗೊಳಿಸು' ಆಯ್ಕೆಯನ್ನು ತೆಗೆ."
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
-"ನಿರ್ಗಮ, ಪುನರಾರಂಭ, ಸ್ಥಬ್ಧಗೊಳಿಸಲು ಆಯ್ಕೆ ಖಚಿತಗೊಳಿಸಲು ಮರುಪ್ರಶ್ನೆಗಳನ್ನು "
-"ಮೂಡುವಂತಾಗಿಸಬೇಕೊ ಅಥವಾ ಬೇಡವೊ."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "ತೆರೆಯನ್ನು ಬಂಧಿಸು"
-
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "ಸ್ಥಗಿತಗೊಳಿಸು"
-
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "ನಿರ್ಗಮಿಸು"
-
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "ಪುನರಾರಂಭಿಸು"
-
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "ನಿರ್ಗಮಿಸು..."
-
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "ಪುನರಾರಂಭಿಸು"
-
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "ಸ್ಥಗಿತಗೊಳಿಸು..."
-
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "ನಿರ್ಗಮಿಸು"
-
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "ಪುನರಾರಂಭಿಸು"
-
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
-msgstr "ಸ್ಥಬ್ಧಗೊಳಿಸು"
-
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
-msgstr "ಎಲ್ಲಾ ಕಾರ್ಯಗಳನ್ನು ಮುಚ್ಚಿ, ಗಣಕದಿಂದ ನಿರ್ಗಮಿಸಬೇಕೆಂದು ಖಚಿತಪಡಿಸುವಿರ?"
-
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
-msgstr "ಎಲ್ಲಾ ಕಾರ್ಯಗಳನ್ನು ಮುಚ್ಚಿ, ಗಣಕವನ್ನು ಪುನರಾರಂಭಿಸಬೇಕೆಂದು ಖಚಿತಪಡಿಸುವಿರ?"
-
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
-msgstr "ಎಲ್ಲಾ ಕಾರ್ಯಗಳನ್ನು ಮುಚ್ಚಿ, ಗಣಕವನ್ನು ಸ್ಥಗಿತಗೊಳಿಸಬೇಕೆಂದು ಖಚಿತಪಡಿಸುವಿರ?"
-
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "ನಿರ್ಗಮಿಸು"
-
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "ಪುನರಾರಂಭಿಸು"
-
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "ಸ್ಥಬ್ಧಗೊಳಿಸು"
-
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "ನಿರ್ಗಮಿಸು"
-
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
+#: ../src/service.c:325
+msgid "Guest"
 msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
 msgstr ""
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
 msgstr ""
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
+#: ../src/service.c:346
+msgid "About This Computer"
 msgstr ""
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
+#: ../src/service.c:361
+msgid "System Settings…"
 msgstr ""
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
+#: ../src/service.c:363
+msgid "Online Accounts…"
 msgstr ""
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
+#: ../src/service.c:566
+msgid "Start Screen Saver"
 msgstr ""
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
 msgstr ""
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
 msgstr ""
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
 msgstr ""
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
 msgstr ""
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
+#: ../src/service.c:594
+msgid "Lock"
 msgstr ""
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr ""
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "ಅತಿಥಿ ಅಧಿವೇಶನ"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr ""
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "ನಿರ್ಗಮಿಸು..."
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr ""
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
+msgid "Log Out"
+msgstr "ನಿರ್ಗಮಿಸು"
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
+#: ../src/service.c:714
+msgid "Suspend"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr ""
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "ಹೈಬರ್ನೇಟ್"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr ""
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr "ಪುನರಾರಂಭಿಸು"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr ""
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "ಪುನರಾರಂಭಿಸು"
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr ""
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr "ಸ್ಥಗಿತಗೊಳಿಸು..."
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr ""
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr "ಸ್ಥಗಿತಗೊಳಿಸು"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "ಹೈಬರ್ನೇಟ್"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
+msgstr "ಎಲ್ಲಾ ಕಾರ್ಯಗಳನ್ನು ಮುಚ್ಚಿ, ಗಣಕದಿಂದ ನಿರ್ಗಮಿಸಬೇಕೆಂದು ಖಚಿತಪಡಿಸುವಿರ?"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "ಅತಿಥಿ ಅಧಿವೇಶನ"
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr "ಕೆಲವು ತಂತ್ರಾಂಶಗಳು ಗಣಕ ಯಂತ್ರವನ್ನು  ಪುನರಾರಂಭಿಸುವ ವರೆಗೂ  ಕೆಲಸ ಮಾಡುವುದಿಲ್ಲ"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
 msgstr ""
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr "ಎಲ್ಲಾ ಕಾರ್ಯಗಳನ್ನು ಮುಚ್ಚಿ, ಗಣಕವನ್ನು ಪುನರಾರಂಭಿಸಬೇಕೆಂದು ಖಚಿತಪಡಿಸುವಿರ?"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr "ಎಲ್ಲಾ ಕಾರ್ಯಗಳನ್ನು ಮುಚ್ಚಿ, ಗಣಕವನ್ನು ಸ್ಥಗಿತಗೊಳಿಸಬೇಕೆಂದು ಖಚಿತಪಡಿಸುವಿರ?"
+
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
+#~ msgid "Lock Screen"
+#~ msgstr "ತೆರೆಯನ್ನು ಬಂಧಿಸು"
+
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "ನಿರ್ಗಮಿಸು"
+
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "ಪುನರಾರಂಭಿಸು"
+
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "ಸ್ಥಬ್ಧಗೊಳಿಸು"
+
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "ನಿರ್ಗಮಿಸು"
+
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "ಪುನರಾರಂಭಿಸು"
+
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "ಸ್ಥಬ್ಧಗೊಳಿಸು"
+
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "ನಿರ್ಗಮಿಸು"
+
 #~ msgid "Switch User..."
 #~ msgstr "ಬಳಕೆದಾರರನು   ಬದಲಾಯಿಸಿ..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "%s ನಿಂದ ಬಳಕೆದಾರನನ್ನು ಬದಲಾಯಿಸಿ..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "ಕೆಲವು ತಂತ್ರಾಂಶಗಳು ಗಣಕ ಯಂತ್ರವನ್ನು  ಪುನರಾರಂಭಿಸುವ ವರೆಗೂ  ಕೆಲಸ ಮಾಡುವುದಿಲ್ಲ"
-
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
 #~ msgstr "ಅಧಿವೇಶನ ಮೆನೂವಿನಲ್ಲಿ 'ಲಾಗ್‌ಔಟ್' ಆಯ್ಕೆ ಕಾಣದಂತೆ ಮಾಡು."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "'ಪುನರಾರಂಭ' ಗುಂಡಿಯನ್ನು ಅಧಿವೇಶನ ಮೆನೂವಿನಲ್ಲಿ ಕಾಣದಂತೆ ಮಾಡು."
 
 #~ msgid ""
diff --git a/po/ko.po b/po/ko.po
index 1f98011..63847b5 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2011-09-24 13:47+0000\n"
 "Last-Translator: Jinkyu Yi <Unknown>\n"
 "Language-Team: Korean\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,267 +19,300 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr "나가는 단추를 세션 메뉴에 나타나지 않게 합니다."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr "나가거나 다시 시작, 또는 컴퓨터를 끌 때 물어보지 않음"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr "다시 시작 단추가 세션 메뉴에 나타나지 않게 합니다."
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
-msgstr "컴퓨터 끄기 단추가 세션 메뉴에 나타나지 않게 합니다."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr "나가거나 다시 시작, 또는 컴퓨터를 끌 때 물어볼지 결정합니다."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "세션 메뉴에서 나가기 항목 빼기"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr "나가는 단추를 세션 메뉴에 나타나지 않게 합니다."
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "세션 메뉴에서 다시 시작 항목 빼기"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
-msgstr "세션 메뉴에서 컴퓨터 끄기 항목 빼기"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr "다시 시작 단추가 세션 메뉴에 나타나지 않게 합니다."
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
-msgstr "나가거나 다시 시작, 또는 컴퓨터를 끌 때 물어보지 않음"
+msgid "Remove the shutdown item from the session menu"
+msgstr "세션 메뉴에서 컴퓨터 끄기 항목 빼기"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
-msgstr "나가거나 다시 시작, 또는 컴퓨터를 끌 때 물어볼지 결정합니다."
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr "컴퓨터 끄기 단추가 세션 메뉴에 나타나지 않게 합니다."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "예전 손님 세션"
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
+msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "손님 세션을 예전 데스크톱 환경에서 엽니다."
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "화면 잠금"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "손님"
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "컴퓨터 끄기"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "나가기"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "다시 시작"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "나가기..."
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "시스템 설정..."
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "다시 시작..."
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "온라인 계정..."
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "컴퓨터 끄기..."
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
+
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "온라인 계정..."
+
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
+
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "온라인 계정..."
+
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
+msgstr ""
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "손님 세션"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "나가기..."
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "나가기"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "대기"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "잠자기"
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr "다시 시작..."
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
 msgid "Restart"
 msgstr "다시 시작"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr "컴퓨터 끄기..."
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
 msgstr "컴퓨터 끄기"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr "모든 프로그램을 닫고 나가시겠습니까?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr "일부 소프트웨어 업데이트는 다음 다시 시작까지 적용되지 않습니다."
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "취소"
+
+#: ../src/backend-dbus/actions.c:862
 msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr "모든 프로그램을 닫고 컴퓨터를 다시 시작하시겠습니까?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr "모든 프로그램을 닫고 컴퓨터를 끄시겠습니까?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "나가기"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "다시 시작"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "컴퓨터 끄기"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "나가기"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr "다시 시작..."
+#~ msgid "Classic Guest Session"
+#~ msgstr "예전 손님 세션"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr "컴퓨터 끄기..."
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "손님 세션을 예전 데스크톱 환경에서 엽니다."
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "대신 다시 시작"
+#~ msgid "Lock Screen"
+#~ msgstr "화면 잠금"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "대신 다시 시작..."
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "나가기"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr "일부 소프트웨어 업데이트는 컴퓨터가 다시 시작하기 전까지 적용되지 않을 수 있습니다."
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "다시 시작"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "취소"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "컴퓨터 끄기"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "1"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "나가기"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "다시 시작"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "%s에서 다른 계정으로..."
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "컴퓨터 끄기"
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "최신 상태의 소프트웨어"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "나가기"
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "업데이트 있음..."
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "다시 시작..."
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "업데이트 설치중..."
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "컴퓨터 끄기..."
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr "업데이트를 다하기 위해 다시 시작..."
+#~ msgid "Restart Instead"
+#~ msgstr "대신 다시 시작"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "시스템 설정..."
+#~ msgid "Restart Instead…"
+#~ msgstr "대신 다시 시작..."
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "화면..."
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr ""
+#~ "일부 소프트웨어 업데이트는 컴퓨터가 다시 시작하기 전까지 적용되지 않을 수 "
+#~ "있습니다."
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "시작 프로그램..."
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "1"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "연결된 장치"
+#~ msgid "Switch From %s…"
+#~ msgstr "%s에서 다른 계정으로..."
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "프린터"
+#~ msgid "Software Up to Date"
+#~ msgstr "최신 상태의 소프트웨어"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "스캐너"
+#~ msgid "Updates Available…"
+#~ msgstr "업데이트 있음..."
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "웹캠"
+#~ msgid "Updates Installing…"
+#~ msgstr "업데이트 설치중..."
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "대기"
+#~ msgid "Restart to Complete Updates…"
+#~ msgstr "업데이트를 다하기 위해 다시 시작..."
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "잠자기"
+#~ msgid "Displays…"
+#~ msgstr "화면..."
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "손님 세션"
+#~ msgid "Startup Applications…"
+#~ msgstr "시작 프로그램..."
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "손님"
+#~ msgid "Attached Devices"
+#~ msgstr "연결된 장치"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "온라인 계정..."
+#~ msgid "Printers"
+#~ msgstr "프린터"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "사용자 계정..."
+#~ msgid "Scanners"
+#~ msgstr "스캐너"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "%s 웹캠"
+#~ msgid "Webcam"
+#~ msgstr "웹캠"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "스캐너"
+#~ msgid "User Accounts…"
+#~ msgstr "사용자 계정..."
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "%s 스캐너"
+#~ msgid "%s Webcam"
+#~ msgstr "%s 웹캠"
+
+#~ msgid "Scanner"
+#~ msgstr "스캐너"
+
+#~ msgid "%s Scanner"
+#~ msgstr "%s 스캐너"
 
 #~ msgid "Shut Down..."
 #~ msgstr "컴퓨터 끄기..."
@@ -296,13 +330,9 @@ msgstr "%s 스캐너"
 #~ msgid "Restart..."
 #~ msgstr "다시 시작..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr "일부 소프트웨어 업데이트는 다음 다시 시작까지 적용되지 않습니다."
-
 #~ msgid "Restart Instead..."
 #~ msgstr "대신 다시 시작..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "%s에서 전환..."
 
@@ -316,7 +346,8 @@ msgstr "%s 스캐너"
 #~ msgid "Restart to Complete Update…"
 #~ msgstr "업데이트를 완료하기 위해 다시 시작합니다..."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "세션 메뉴에서 다시 시작 버튼이 보이지 않게 합니다."
 
 #~ msgid ""
diff --git a/po/ku.po b/po/ku.po
index ed29387..fffd204 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2010-12-29 22:51+0000\n"
 "Last-Translator: Ken VanDine <ken.vandine@canonical.com>\n"
 "Language-Team: Kurdish <ku@li.org>\n"
+"Language: ku\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,20 +19,23 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr ""
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr "Diyaloga ji bo erêkirina derketin, nûdestpêkirin û girtinê nîşan nede"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgid ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
+"Ji bo tevgerên derketin, nûdestpêkirin û girtinê diyaloxa erêkirinê nîşnbide "
+"yan na."
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
-msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+msgid "Remove the Log Out item from the session menu"
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
-msgid "Remove the Log Out item from the session menu"
+msgid "Makes it so that the logout button doesn’t show in the session menu."
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
@@ -39,249 +43,207 @@ msgid "Remove the Restart item from the session menu"
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgid "Remove the shutdown item from the session menu"
 msgstr ""
-"Diyaloga ji bo erêkirina derketin, nûdestpêkirin û girtinê nîşan nede"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
-"Ji bo tevgerên derketin, nûdestpêkirin û girtinê diyaloxa erêkirinê nîşnbide "
-"yan na."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Ekranê qefil bike"
-
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Girtin"
-
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Derkeve"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Nûdestpêkirin"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Derketin..."
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Nûdestpêkirin..."
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Girtin..."
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "Derketin"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "Nûdestpêkirin"
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
-msgstr "Girtin"
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
 msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
 msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
 msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "Derketin"
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Dîsdestpêkirin"
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Danişîna Mêvanî"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Girtin"
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Derketin..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
-msgstr "Derketin"
+msgstr "Derkeve"
+
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Têxe xewê"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Xewa kûr"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
+#: ../src/service.c:722
 msgid "Restart…"
-msgstr ""
+msgstr "Nûdestpêkirin..."
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "Nûdestpêkirin"
+
+#: ../src/service.c:729
 msgid "Shut Down…"
-msgstr ""
+msgstr "Girtin..."
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Şûna wê dîsdestpêkirin"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr "Girtin"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
+#: ../src/backend-dbus/actions.c:818
+msgid "Are you sure you want to close all programs and log out?"
 msgstr ""
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
+#: ../src/backend-dbus/actions.c:819
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
 msgstr ""
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
 msgid "Cancel"
 msgstr "Betal"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "0"
-
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr ""
-
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr ""
-
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr ""
-
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr ""
-
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr ""
-
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr ""
-
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr ""
+#~ msgid "Lock Screen"
+#~ msgstr "Ekranê qefil bike"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Têxe xewê"
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Derketin"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Xewa kûr"
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Nûdestpêkirin"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Danişîna Mêvanî"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Girtin"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Derketin"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Dîsdestpêkirin"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Girtin"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr ""
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Derketin"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr ""
+#~ msgid "Restart Instead"
+#~ msgstr "Şûna wê dîsdestpêkirin"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr ""
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "0"
 
 #~ msgid "Restart..."
 #~ msgstr "Nûdestpêkirin..."
@@ -292,7 +254,6 @@ msgstr ""
 #~ msgid "Switch User..."
 #~ msgstr "Bikarhêner Biguherîne..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Ji %s derbas be..."
 
diff --git a/po/kw.po b/po/kw.po
new file mode 100644
index 0000000..2301e72
--- /dev/null
+++ b/po/kw.po
@@ -0,0 +1,204 @@
+# Cornish translations for PACKAGE package.
+# Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
+"PO-Revision-Date: 2017-07-21 15:41+0200\n"
+"Last-Translator: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n"
+"Language-Team: Cornish\n"
+"Language: kw\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
+msgid ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
+msgid "Remove the Log Out item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
+msgid "Remove the Restart item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
+msgid "Remove the shutdown item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr ""
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
+msgstr ""
+
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
+
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
+
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
+
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
+
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
+
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
+
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
+
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
+
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
+
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
+
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
+
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
+msgstr ""
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr ""
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr ""
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
+msgid "Log Out"
+msgstr ""
+
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr ""
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr ""
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr ""
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr ""
+
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr ""
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:818
+msgid "Are you sure you want to close all programs and log out?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:819
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
diff --git a/po/ky.po b/po/ky.po
index f0a158b..300dd63 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2011-05-31 04:24+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Kirghiz <ky@li.org>\n"
+"Language: ky\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,20 +19,21 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgid ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
-msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+msgid "Remove the Log Out item from the session menu"
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
-msgid "Remove the Log Out item from the session menu"
+msgid "Makes it so that the logout button doesn’t show in the session menu."
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
@@ -39,243 +41,166 @@ msgid "Remove the Restart item from the session menu"
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgid "Remove the shutdown item from the session menu"
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
-msgstr ""
-
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr ""
-
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
+#: ../src/service.c:325
+msgid "Guest"
 msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
 msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
 msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
+#: ../src/service.c:346
+msgid "About This Computer"
 msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
+#: ../src/service.c:361
+msgid "System Settings…"
 msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
+#: ../src/service.c:363
+msgid "Online Accounts…"
 msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
+#: ../src/service.c:566
+msgid "Start Screen Saver"
 msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
 msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
 msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
 msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
 msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
+#: ../src/service.c:594
+msgid "Lock"
 msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
+#: ../src/service.c:619
+msgid "Guest Session"
 msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
+#: ../src/service.c:696
+msgid "Log Out…"
 msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr ""
-
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr ""
-
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr ""
-
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr ""
-
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
-
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr ""
-
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr ""
-
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr ""
-
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr ""
-
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr ""
-
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr ""
-
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr ""
-
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr ""
-
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr ""
-
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
+#: ../src/service.c:714
+msgid "Suspend"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
+#: ../src/service.c:717
+msgid "Hibernate"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
+#: ../src/service.c:722
+msgid "Restart…"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
+#: ../src/service.c:729
+msgid "Shut Down…"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
+#: ../src/backend-dbus/actions.c:818
+msgid "Are you sure you want to close all programs and log out?"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
+#: ../src/backend-dbus/actions.c:819
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
 msgstr ""
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
 msgstr ""
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
diff --git a/po/la.po b/po/la.po
new file mode 100644
index 0000000..f7dbfe3
--- /dev/null
+++ b/po/la.po
@@ -0,0 +1,204 @@
+# Latin translations for PACKAGE package.
+# Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
+"PO-Revision-Date: 2017-07-21 15:41+0200\n"
+"Last-Translator: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n"
+"Language-Team: Latin\n"
+"Language: la\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
+msgid ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
+msgid "Remove the Log Out item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
+msgid "Remove the Restart item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
+msgid "Remove the shutdown item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr ""
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
+msgstr ""
+
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
+
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
+
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
+
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
+
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
+
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
+
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
+
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
+
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
+
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
+
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
+
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
+msgstr ""
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr ""
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr ""
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
+msgid "Log Out"
+msgstr ""
+
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr ""
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr ""
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr ""
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr ""
+
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr ""
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:818
+msgid "Are you sure you want to close all programs and log out?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:819
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
diff --git a/po/lb.po b/po/lb.po
index ef8ac06..233f906 100644
--- a/po/lb.po
+++ b/po/lb.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2011-09-09 18:49+0000\n"
 "Last-Translator: Edson <soued0311@hotmail.com>\n"
 "Language-Team: Luxembourgish <lb@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,276 +19,304 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr "Mécht dass de Knäppchen \"Ofmellen\" net am Sessiounsmenü opdaucht."
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
 msgstr ""
-"Mécht dass de Knäppchen \"Nei starten\" net am Sessiounsmenü opdaucht."
+"Keng Bestätegung weise fir de Computer nei ze starten, auszemaachen an "
+"ofzemellen"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
-"Mécht dass de Knäppchen \"Ausmaachen\" net am Sessiounsmenü opdaucht."
+"D'Bestätegungsfënster weise fir de Computer nei ze starten, auszemaachen an "
+"ofzemellen."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Den Element \"Ofmellen\" aus dem Sessiounsmenü ewechmaachen"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr "Mécht dass de Knäppchen \"Ofmellen\" net am Sessiounsmenü opdaucht."
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Den Element \"Nei starten\" aus dem Sessiounsmenü ewechmaachen"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr "Mécht dass de Knäppchen \"Nei starten\" net am Sessiounsmenü opdaucht."
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
 msgid "Remove the shutdown item from the session menu"
 msgstr "Den Element \"Ausmaachen\" aus dem Sessiounsmenü ewechmaachen"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr "Mécht dass de Knäppchen \"Ausmaachen\" net am Sessiounsmenü opdaucht."
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"Keng Bestätegung weise fir de Computer nei ze starten, auszemaachen an "
-"ofzemellen"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
-"D'Bestätegungsfënster weise fir de Computer nei ze starten, auszemaachen an "
-"ofzemellen."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "Klassesch Gaaschtsessioun"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "Gaascht"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "Eng Gaaschtsessioun am klasseschen Desktop starten"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Bildschierm spären"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Ausmaachen"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Ofmellen"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "Systemastellungen…"
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Nei starten"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "Online-Konten…"
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Ofmellen..."
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Nei starten..."
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "Online-Konten…"
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Ausmaachen..."
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
+
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "Online-Konten…"
+
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
+msgstr ""
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Gaaschtsessioun"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Ofmellen..."
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Ofmellen"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Schlofmodus"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Wanterschlof"
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr "Nei starten..."
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
 msgid "Restart"
 msgstr "Nei starten"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr "Ausmaachen..."
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
 msgstr "Ausmaachen"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr ""
 "Wëllt Dir wierklech all Programmer zoumaachen an Iech vum Computer ofmellen?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+"Verschidde Softwareupdatë funktionéiere réischt wann Dir de Computer nei "
+"start."
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "Ofbriechen"
+
+#: ../src/backend-dbus/actions.c:862
 msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
 "Wëllt Dir wierklech all Programmer zoumaachen an de Computer nei starten?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
 "Wëllt Dir wierklech all Programmer zoumaachen an de Computer ausmaachen?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "Ofmellen"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Nei starten"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Ausmaachen"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Ofmellen"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr "Nei starten..."
+#~ msgid "Classic Guest Session"
+#~ msgstr "Klassesch Gaaschtsessioun"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr "Ausmaachen..."
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "Eng Gaaschtsessioun am klasseschen Desktop starten"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Léiwer nei starten"
+#~ msgid "Lock Screen"
+#~ msgstr "Bildschierm spären"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "Léiwer nei starten..."
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Ofmellen"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr "Puer Updatë ginn eréischt no engem Neistart applizéiert."
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Nei starten"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "Ofbriechen"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Ausmaachen"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "1"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Ofmellen"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Nei starten"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "Vun %s wiesselen…"
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Ausmaachen"
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "Software ass aktuell"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Ofmellen"
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "Updatë si verfügbar..."
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "Nei starten..."
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "Updatë ginn installéiert..."
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "Ausmaachen..."
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr ""
+#~ msgid "Restart Instead"
+#~ msgstr "Léiwer nei starten"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "Systemastellungen…"
+#~ msgid "Restart Instead…"
+#~ msgstr "Léiwer nei starten..."
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "Bildschiermer..."
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr "Puer Updatë ginn eréischt no engem Neistart applizéiert."
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "Startprogrammer..."
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "1"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "Ugeschloss Geräter"
+#~ msgid "Switch From %s…"
+#~ msgstr "Vun %s wiesselen…"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "Drécker"
+#~ msgid "Software Up to Date"
+#~ msgstr "Software ass aktuell"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "Scanneren"
+#~ msgid "Updates Available…"
+#~ msgstr "Updatë si verfügbar..."
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "Webcam"
+#~ msgid "Updates Installing…"
+#~ msgstr "Updatë ginn installéiert..."
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Schlofmodus"
+#~ msgid "Displays…"
+#~ msgstr "Bildschiermer..."
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Wanterschlof"
+#~ msgid "Startup Applications…"
+#~ msgstr "Startprogrammer..."
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Gaaschtsessioun"
+#~ msgid "Attached Devices"
+#~ msgstr "Ugeschloss Geräter"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "Gaascht"
+#~ msgid "Printers"
+#~ msgstr "Drécker"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "Online-Konten…"
+#~ msgid "Scanners"
+#~ msgstr "Scanneren"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "Benotzerkonten"
+#~ msgid "Webcam"
+#~ msgstr "Webcam"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "%s Webcam"
+#~ msgid "User Accounts…"
+#~ msgstr "Benotzerkonten"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "Scanner"
+#~ msgid "%s Webcam"
+#~ msgstr "%s Webcam"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "%s Scanner"
+#~ msgid "Scanner"
+#~ msgstr "Scanner"
+
+#~ msgid "%s Scanner"
+#~ msgstr "%s Scanner"
 
 #~ msgid "Restart Instead..."
 #~ msgstr "Léiwer nei starten..."
@@ -315,7 +344,6 @@ msgstr "%s Scanner"
 #~ msgid "Session"
 #~ msgstr "Sëtzung"
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Benotzer %s wiesselen…"
 
@@ -332,10 +360,6 @@ msgstr "%s Scanner"
 #~ msgid "Restart to Complete Update"
 #~ msgstr "Nei starten, fir den Update ofzeschléissen"
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Verschidde Softwareupdatë funktionéiere réischt wann Dir de Computer nei "
-#~ "start."
-
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "Mécht, dass de Knäppchen Nei starten net am Sessiounsmenü opdaucht."
diff --git a/po/lo.po b/po/lo.po
new file mode 100644
index 0000000..f8d7faf
--- /dev/null
+++ b/po/lo.po
@@ -0,0 +1,204 @@
+# Laotian translations for PACKAGE package.
+# Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
+"PO-Revision-Date: 2017-07-21 15:41+0200\n"
+"Last-Translator: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n"
+"Language-Team: Laotian\n"
+"Language: lo\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
+msgid ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
+msgid "Remove the Log Out item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
+msgid "Remove the Restart item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
+msgid "Remove the shutdown item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr ""
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
+msgstr ""
+
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
+
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
+
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
+
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
+
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
+
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
+
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
+
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
+
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
+
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
+
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
+
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
+msgstr ""
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr ""
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr ""
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
+msgid "Log Out"
+msgstr ""
+
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr ""
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr ""
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr ""
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr ""
+
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr ""
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:818
+msgid "Are you sure you want to close all programs and log out?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:819
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
diff --git a/po/lt.po b/po/lt.po
index b0e5df7..72addf1 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2011-09-18 09:24+0000\n"
 "Last-Translator: Aurimas Fišeras <Unknown>\n"
 "Language-Team: Lithuanian <lt@li.org>\n"
+"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,274 +19,309 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr "Padaro, kad atsijungimo mygtukas nebūtų rodomas seanso meniu."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+"Nerodyti dialogo lango atsijungimo, paleidimo iš naujo ir išjungimo "
+"veiksmams patvirtinti"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr "Padaro, kad paleidimo iš naujo mygtukas nebūtų rodomas seanso meniu."
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
-msgstr "Padaro, kad išjungimo mygtukas nebūtų rodomas seanso meniu."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+"Rodyti ar nerodyti patvirtinimo dialogo langą atsijungimo, paleidimo iš "
+"naujo ir išjungimo veiksmams."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Pašalinti atsijungimo punktą iš seanso meniu"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr "Padaro, kad atsijungimo mygtukas nebūtų rodomas seanso meniu."
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Pašalinti paleidimo iš naujo įrašą iš seanso meniu"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr "Padaro, kad paleidimo iš naujo mygtukas nebūtų rodomas seanso meniu."
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
 msgid "Remove the shutdown item from the session menu"
 msgstr "Pašalinti išjungimo įrašą iš seanso meniu"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr "Padaro, kad išjungimo mygtukas nebūtų rodomas seanso meniu."
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"Nerodyti dialogo lango atsijungimo, paleidimo iš naujo ir išjungimo "
-"veiksmams patvirtinti"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
-"Rodyti ar nerodyti patvirtinimo dialogo langą atsijungimo, paleidimo iš "
-"naujo ir išjungimo veiksmams."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "Klasikinis svečio seansas"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "Svečias"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "Pradėti svečio seansą naudojant klasikinį darbalaukį"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Užrakinti ekraną"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Išjungti"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Atsijungti"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "Sistemos nustatymai..."
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Paleisti iš naujo"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "Interneto paskyros..."
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Atsijungti..."
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Paleisti iš naujo..."
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "Perjungti naudotoją..."
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Išjungti..."
+#: ../src/service.c:575 ../src/service.c:591
+#, fuzzy
+msgid "Switch Account"
+msgstr "Perjungti naudotoją..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "Perjungti naudotoją..."
+
+#: ../src/service.c:588
+#, fuzzy
+msgid "Lock/Switch Account"
+msgstr "Perjungti naudotoją..."
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Svečio seansas"
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Atsijungti..."
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Atsijungti"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Sustabdyti"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Hibernuoti"
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr "Paleisti iš naujo..."
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
 msgid "Restart"
 msgstr "Paleisti iš naujo"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr "Išjungti..."
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
 msgstr "Išjungti"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr "Ar tikrai norite užverti visas programas ir atsijungti?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+"Kai kurie programų atnaujinimai nebus pritaikyti kol kompiuteris nebus "
+"paleistas iš naujo."
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "Atsisakyti"
+
+#: ../src/backend-dbus/actions.c:862
 msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
 "Ar tikrai norite užverti visas programas ir paleisti kompiuterį iš naujo?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr "Ar tikrai norite užverti visas programas ir išjungti kompiuterį?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "Atsijungti"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Paleisti iš naujo"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Išjungti"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Atsijungti"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr "Paleisti iš naujo..."
+#~ msgid "Classic Guest Session"
+#~ msgstr "Klasikinis svečio seansas"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr "Išjungti..."
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "Pradėti svečio seansą naudojant klasikinį darbalaukį"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Geriau paleisti iš naujo"
+#~ msgid "Lock Screen"
+#~ msgstr "Užrakinti ekraną"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "Geriau paleisti iš naujo..."
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Atsijungti"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
-"Kai kurie programinės įrangos atnaujinimai nebus pritaikyti iki kito "
-"kompiuterio paleidimo iš naujo."
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Paleisti iš naujo"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "Atsisakyti"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Išjungti"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "0"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Atsijungti"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr "Perjungti naudotoją..."
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Paleisti iš naujo"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "Persijungti iš %s..."
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Išjungti"
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "Programinė įranga atnaujinta"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Atsijungti"
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "Yra atnaujinimų..."
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "Paleisti iš naujo..."
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "Įdiegiami atnaujinimai..."
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "Išjungti..."
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr "Paleisti iš naujo atnaujinimams užbaigti..."
+#~ msgid "Restart Instead"
+#~ msgstr "Geriau paleisti iš naujo"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "Sistemos nustatymai..."
+#~ msgid "Restart Instead…"
+#~ msgstr "Geriau paleisti iš naujo..."
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "Ekranai..."
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr ""
+#~ "Kai kurie programinės įrangos atnaujinimai nebus pritaikyti iki kito "
+#~ "kompiuterio paleidimo iš naujo."
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "Paleidžiamos programos..."
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "0"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "Prijungti įrenginiai"
+#~ msgid "Switch From %s…"
+#~ msgstr "Persijungti iš %s..."
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "Spausdintuvai"
+#~ msgid "Software Up to Date"
+#~ msgstr "Programinė įranga atnaujinta"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "Skaitytuvai"
+#~ msgid "Updates Available…"
+#~ msgstr "Yra atnaujinimų..."
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "Internetinė kamera"
+#~ msgid "Updates Installing…"
+#~ msgstr "Įdiegiami atnaujinimai..."
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Sustabdyti"
+#~ msgid "Restart to Complete Updates…"
+#~ msgstr "Paleisti iš naujo atnaujinimams užbaigti..."
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Hibernuoti"
+#~ msgid "Displays…"
+#~ msgstr "Ekranai..."
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Svečio seansas"
+#~ msgid "Startup Applications…"
+#~ msgstr "Paleidžiamos programos..."
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "Svečias"
+#~ msgid "Attached Devices"
+#~ msgstr "Prijungti įrenginiai"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "Interneto paskyros..."
+#~ msgid "Printers"
+#~ msgstr "Spausdintuvai"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "Naudotojų paskyros..."
+#~ msgid "Scanners"
+#~ msgstr "Skaitytuvai"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "%s kamera"
+#~ msgid "Webcam"
+#~ msgstr "Internetinė kamera"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "Skaitytuvas"
+#~ msgid "User Accounts…"
+#~ msgstr "Naudotojų paskyros..."
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "%s skaitytuvas"
+#~ msgid "%s Webcam"
+#~ msgstr "%s kamera"
+
+#~ msgid "Scanner"
+#~ msgstr "Skaitytuvas"
+
+#~ msgid "%s Scanner"
+#~ msgstr "%s skaitytuvas"
 
 #~ msgid "Restart..."
 #~ msgstr "Paleisti iš naujo..."
@@ -303,11 +339,6 @@ msgstr "%s skaitytuvas"
 #~ msgid "Restart..."
 #~ msgstr "Paleisti iš naujo..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Kai kurie programų atnaujinimai nebus pritaikyti kol kompiuteris nebus "
-#~ "paleistas iš naujo."
-
 #~ msgid "Restart Instead..."
 #~ msgstr "Geriau paleisti iš naujo..."
 
@@ -318,14 +349,14 @@ msgstr "%s skaitytuvas"
 #~ msgid "Shut Down..."
 #~ msgstr "Išjungti..."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "Padaro, kad nesimatytų paleidimo iš naujo mygtuko seanso meniu."
 
 #~ msgid ""
 #~ "Makes it so that the shutdown button doesn't show in the session menu."
 #~ msgstr "Padaro, kad nesimatytų išjungimo mygtuko seanso meniu."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Persijungti iš %s..."
 
diff --git a/po/lv.po b/po/lv.po
index d68546b..1647ed9 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2011-09-22 09:55+0000\n"
 "Last-Translator: Rūdolfs Mazurs <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
+"Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,277 +19,312 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr "Likt atteikšanās pogai nerādīties sesijas izvēlnē."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+"Nerādīt logu, lai apstiprinātu atteikšanos, pārstartēšanu un izslēgšanu"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr "Likt pārstartēšanas pogai nerādīties sesijas izvēlnē."
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
-msgstr "Likt izslēgšanas pogai nerādīties sesijas izvēlnē."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+"Rādīt vai nerādīt apstiprināšanas logus atsakoties, pārstartējot un izslēdzot"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Izņem atteikšanās izvēli no sesijas izvēlnes"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr "Likt atteikšanās pogai nerādīties sesijas izvēlnē."
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Izņem pārstartēšanas izvēli no sesijas izvēlnes"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr "Likt pārstartēšanas pogai nerādīties sesijas izvēlnē."
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
 msgid "Remove the shutdown item from the session menu"
 msgstr "Izņem izslēgšanas izvēli no sesijas izvēlnes"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr "Likt izslēgšanas pogai nerādīties sesijas izvēlnē."
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"Nerādīt logu, lai apstiprinātu atteikšanos, pārstartēšanu un izslēgšanu"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
-"Rādīt vai nerādīt apstiprināšanas logus atsakoties, pārstartējot un izslēdzot"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "Klasiska viesa sesija"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "Viesis"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "Palaist viesa sesiju, izmantojot klasisko darbvirsmu"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Slēgt ekrānu"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Izslēgt"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Atteikties"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "Sistēmas iestatījumi..."
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Pārstartēt"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "Tiesšaistes konti..."
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Atteikties..."
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Pārstartēt..."
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "Pārslēgt lietotāja kontu..."
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Izslēgt..."
+#: ../src/service.c:575 ../src/service.c:591
+#, fuzzy
+msgid "Switch Account"
+msgstr "Pārslēgt lietotāja kontu..."
+
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "Pārslēgt lietotāja kontu..."
+
+#: ../src/service.c:588
+#, fuzzy
+msgid "Lock/Switch Account"
+msgstr "Pārslēgt lietotāja kontu..."
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Viesa sesija"
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Atteikties..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Atteikties"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Iesnaudināt"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Iemidzināt"
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr "Pārstartēt..."
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
 msgid "Restart"
 msgstr "Pārstartēt"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr "Izslēgt..."
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
 msgstr "Izslēgt"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr ""
 "Vai esat pārliecināti, ka vēlaties aizvērt visas programmas un atteikties no "
 "sistēmas?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+"Daži programmatūras uzlabojumi netiks attiecināti līdz nākošajai datora "
+"pārstartēšanai"
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "Atcelt"
+
+#: ../src/backend-dbus/actions.c:862
 msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
 "Vai esat pārliecināti, ka vēlaties aizvērt visas programmas un pārstartēt "
 "datoru?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
 "Vai esat pārliecināti, ka vēlaties aizvērt visas programmas un izslēgt "
 "datoru?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "Atteikties"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Pārstartēt"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Izslēgt"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Atteikties"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr "Pārstartēt..."
+#~ msgid "Classic Guest Session"
+#~ msgstr "Klasiska viesa sesija"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr "Izslēgt..."
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "Palaist viesa sesiju, izmantojot klasisko darbvirsmu"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Labāk pārstartēt"
+#~ msgid "Lock Screen"
+#~ msgstr "Slēgt ekrānu"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "Tā vietā pārstartēt..."
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Atteikties"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
-"Daži programmatūras atjauninājumi nestāsies spēkā līdz nākamajai "
-"pārstartēšanai."
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Pārstartēt"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "Atcelt"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Izslēgt"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "1"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Atteikties"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr "Pārslēgt lietotāja kontu..."
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Pārstartēt"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "Pārslēgties no %s..."
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Izslēgt"
+
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Atteikties"
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "Aktuālā programmatūra"
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "Pārstartēt..."
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "Pieejamie atjauninājumi..."
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "Izslēgt..."
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "Atjauninājumi, kas instalējas..."
+#~ msgid "Restart Instead"
+#~ msgstr "Labāk pārstartēt"
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr "Pārstartēt, lai pabeigtu atjaunināšanu..."
+#~ msgid "Restart Instead…"
+#~ msgstr "Tā vietā pārstartēt..."
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "Sistēmas iestatījumi..."
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr ""
+#~ "Daži programmatūras atjauninājumi nestāsies spēkā līdz nākamajai "
+#~ "pārstartēšanai."
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "Displeji..."
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "1"
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "Starta lietotnes…"
+#~ msgid "Switch From %s…"
+#~ msgstr "Pārslēgties no %s..."
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "Pieslēgtās ierīces"
+#~ msgid "Software Up to Date"
+#~ msgstr "Aktuālā programmatūra"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "Printeri"
+#~ msgid "Updates Available…"
+#~ msgstr "Pieejamie atjauninājumi..."
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "Skeneri"
+#~ msgid "Updates Installing…"
+#~ msgstr "Atjauninājumi, kas instalējas..."
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "Tīmekļa kamera"
+#~ msgid "Restart to Complete Updates…"
+#~ msgstr "Pārstartēt, lai pabeigtu atjaunināšanu..."
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Iesnaudināt"
+#~ msgid "Displays…"
+#~ msgstr "Displeji..."
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Iemidzināt"
+#~ msgid "Startup Applications…"
+#~ msgstr "Starta lietotnes…"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Viesa sesija"
+#~ msgid "Attached Devices"
+#~ msgstr "Pieslēgtās ierīces"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "Viesis"
+#~ msgid "Printers"
+#~ msgstr "Printeri"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "Tiesšaistes konti..."
+#~ msgid "Scanners"
+#~ msgstr "Skeneri"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "Lietotāja konti..."
+#~ msgid "Webcam"
+#~ msgstr "Tīmekļa kamera"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "%s tīmekļa kameras"
+#~ msgid "User Accounts…"
+#~ msgstr "Lietotāja konti..."
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "Skeneris"
+#~ msgid "%s Webcam"
+#~ msgstr "%s tīmekļa kameras"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "%s skeneris"
+#~ msgid "Scanner"
+#~ msgstr "Skeneris"
+
+#~ msgid "%s Scanner"
+#~ msgstr "%s skeneris"
 
 #~ msgid "Restart..."
 #~ msgstr "Pārstartēt..."
@@ -306,15 +342,9 @@ msgstr "%s skeneris"
 #~ msgid "Restart..."
 #~ msgstr "Pārstartēt..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Daži programmatūras uzlabojumi netiks attiecināti līdz nākošajai datora "
-#~ "pārstartēšanai"
-
 #~ msgid "Restart Instead..."
 #~ msgstr "Labāk pārstartēt"
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Pārslēgties no %s..."
 
@@ -325,7 +355,8 @@ msgstr "%s skeneris"
 #~ msgid "Shut Down..."
 #~ msgstr "Izslēgt..."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "Izņem pārstartēšanas pogu no sesijas izvēlnes."
 
 #~ msgid ""
diff --git a/po/mg.po b/po/mg.po
index 3acc432..9ff3fe0 100644
--- a/po/mg.po
+++ b/po/mg.po
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2011-07-23 12:14+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Malagasy <mg@li.org>\n"
+"Language: mg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,20 +19,21 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgid ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
-msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+msgid "Remove the Log Out item from the session menu"
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
-msgid "Remove the Log Out item from the session menu"
+msgid "Makes it so that the logout button doesn’t show in the session menu."
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
@@ -39,243 +41,166 @@ msgid "Remove the Restart item from the session menu"
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgid "Remove the shutdown item from the session menu"
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
-msgstr ""
-
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr ""
-
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
+#: ../src/service.c:325
+msgid "Guest"
 msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
 msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
 msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
+#: ../src/service.c:346
+msgid "About This Computer"
 msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
+#: ../src/service.c:361
+msgid "System Settings…"
 msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
+#: ../src/service.c:363
+msgid "Online Accounts…"
 msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
+#: ../src/service.c:566
+msgid "Start Screen Saver"
 msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
 msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
 msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
 msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
 msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
+#: ../src/service.c:594
+msgid "Lock"
 msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
+#: ../src/service.c:619
+msgid "Guest Session"
 msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
+#: ../src/service.c:696
+msgid "Log Out…"
 msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr ""
-
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr ""
-
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr ""
-
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr ""
-
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
-
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr ""
-
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr ""
-
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr ""
-
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr ""
-
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr ""
-
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr ""
-
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr ""
-
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr ""
-
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr ""
-
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
+#: ../src/service.c:714
+msgid "Suspend"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
+#: ../src/service.c:717
+msgid "Hibernate"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
+#: ../src/service.c:722
+msgid "Restart…"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
+#: ../src/service.c:729
+msgid "Shut Down…"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
+#: ../src/backend-dbus/actions.c:818
+msgid "Are you sure you want to close all programs and log out?"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
+#: ../src/backend-dbus/actions.c:819
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
 msgstr ""
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
 msgstr ""
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
diff --git a/po/mhr.po b/po/mhr.po
new file mode 100644
index 0000000..4baa47d
--- /dev/null
+++ b/po/mhr.po
@@ -0,0 +1,204 @@
+# Language mhr translations for PACKAGE package.
+# Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
+"PO-Revision-Date: 2017-07-21 15:41+0200\n"
+"Last-Translator: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n"
+"Language-Team: Language mhr\n"
+"Language: mhr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
+msgid ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
+msgid "Remove the Log Out item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
+msgid "Remove the Restart item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
+msgid "Remove the shutdown item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr ""
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
+msgstr ""
+
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
+
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
+
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
+
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
+
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
+
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
+
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
+
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
+
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
+
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
+
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
+
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
+msgstr ""
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr ""
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr ""
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
+msgid "Log Out"
+msgstr ""
+
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr ""
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr ""
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr ""
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr ""
+
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr ""
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:818
+msgid "Are you sure you want to close all programs and log out?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:819
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
diff --git a/po/mi.po b/po/mi.po
new file mode 100644
index 0000000..fd9b638
--- /dev/null
+++ b/po/mi.po
@@ -0,0 +1,204 @@
+# Maori translations for PACKAGE package.
+# Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
+"PO-Revision-Date: 2017-07-21 15:41+0200\n"
+"Last-Translator: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n"
+"Language-Team: Maori\n"
+"Language: mi\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
+msgid ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
+msgid "Remove the Log Out item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
+msgid "Remove the Restart item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
+msgid "Remove the shutdown item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr ""
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
+msgstr ""
+
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
+
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
+
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
+
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
+
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
+
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
+
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
+
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
+
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
+
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
+
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
+
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
+msgstr ""
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr ""
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr ""
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
+msgid "Log Out"
+msgstr ""
+
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr ""
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr ""
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr ""
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr ""
+
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr ""
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:818
+msgid "Are you sure you want to close all programs and log out?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:819
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
diff --git a/po/ml.po b/po/ml.po
index 6be9f2c..eaa09d4 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2010-06-23 05:26+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Malayalam <ml@li.org>\n"
+"Language: ml\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,274 +19,236 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
 msgstr ""
+"പുറത്തു കടക്കുക, പുനരാരംഭിക്കുക, നിര്‍ത്തിവയ്ക്കുക മുതലായ പ്രവര്‍ത്തികളുടെ സ്ഥിരീകരണ ജാലകം "
+"ഒഴിവാക്കുക"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
+"പുറത്തു കടക്കുക, പുനരാരംഭിക്കുക, നിര്‍ത്തിവയ്ക്കുക മുതലായ പ്രവര്‍ത്തികളുടെ സ്ഥിരീകരണ ജാലകം "
+"കാണിക്കണോ, വേണ്ടയോ."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "പ്രവര്‍ത്തനവേളാ മെനുവില്‍ നിന്നും ലോഗൌട്ട് നീക്കം ചെയ്യുക"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
-msgstr ""
-"പ്രവര്‍ത്തനവേളാ മെനുവില്‍ നിന്നും പുനരാരംഭിക്കാനുള്ളത് നീക്കം ചെയ്യുക"
+msgstr "പ്രവര്‍ത്തനവേളാ മെനുവില്‍ നിന്നും പുനരാരംഭിക്കാനുള്ളത് നീക്കം ചെയ്യുക"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
 msgid "Remove the shutdown item from the session menu"
 msgstr "പ്രവര്‍ത്തനവേളാ മെനുവില്‍ നിന്നും ഷട്ട് ഡൗണ്‍ നീക്കം ചെയ്യുക"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
-"പുറത്തു കടക്കുക, പുനരാരംഭിക്കുക, നിര്‍ത്തിവയ്ക്കുക മുതലായ പ്രവര്‍ത്തികളുടെ "
-"സ്ഥിരീകരണ ജാലകം ഒഴിവാക്കുക"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"പുറത്തു കടക്കുക, പുനരാരംഭിക്കുക, നിര്‍ത്തിവയ്ക്കുക മുതലായ പ്രവര്‍ത്തികളുടെ "
-"സ്ഥിരീകരണ ജാലകം കാണിക്കണോ, വേണ്ടയോ."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
+#: ../src/service.c:325
+msgid "Guest"
 msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "സ്ക്രീന്‍ പൂട്ടുക"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "അടച്ചു പൂട്ടുക"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "ലോഗ് ഔട്ട് ചെയ്യുക"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "പുനരാരംഭിക്കുക"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "പൂറത്തു കടക്കുക..."
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "പുനരാരംഭിക്കുക..."
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "അടച്ചു പൂട്ടുക..."
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "പുറത്തു കടക്കുക"
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "പുനരാരംഭിക്കുക"
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
-msgstr "അടച്ചു പൂട്ടുക"
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/service.c:594
+msgid "Lock"
 msgstr ""
-"എല്ലാ പ്രോഗ്രാമുകളും അടചിട്ട്‌ കുമ്പ്യൂട്ടറില്‍ നിന്നും ലോഗ് ഔട്ട്  "
-"ചെയ്യട്ടെ?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
-msgstr "എല്ലാ പ്രോഗ്രാമുകളും അടചിട്ട്‌ കംപ്യൂട്ടര്‍ പുനരാരംഭിക്കട്ടെ ?"
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "അതിഥി പ്രവര്‍ത്തന വേള"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
-msgstr "എല്ലാ പ്രോഗ്രാമുകളും അടചിട്ട്‌ കംപ്യൂട്ടര്‍ ഷട്ട് ഡൌണ്‍ ചെയ്യട്ടെ"
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "പൂറത്തു കടക്കുക..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "ലോഗ് ഔട്ട് ചെയ്യുക"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "പുനരാരംഭിക്കുക"
-
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "അടച്ചു പൂട്ടുക"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "താത്കാലികനിദ്ര"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "പുറത്തു കടക്കുക"
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "ശിശിര നിദ്ര"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
+#: ../src/service.c:722
 msgid "Restart…"
-msgstr ""
+msgstr "പുനരാരംഭിക്കുക..."
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "പുനരാരംഭിക്കുക"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
+#: ../src/service.c:729
 msgid "Shut Down…"
-msgstr ""
+msgstr "അടച്ചു പൂട്ടുക..."
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "പകരം പുനരാരംഭിക്കുക"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr "അടച്ചു പൂട്ടുക"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
+msgstr "എല്ലാ പ്രോഗ്രാമുകളും അടചിട്ട്‌ കുമ്പ്യൂട്ടറില്‍ നിന്നും ലോഗ് ഔട്ട്  ചെയ്യട്ടെ?"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
 msgstr ""
+"ചില സോഫ്റ്റ്‌വെയര്‍ പുതുക്കലുകള്‍ അടുത്ത തവണ കമ്പ്യൂട്ടര്‍ പുനരാരംഭിക്കുന്നത് വരെ പ്രയോഗത്തില്‍ വരില്ല."
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
 msgid "Cancel"
 msgstr "റദ്ദാക്കുക"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "1"
-
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr ""
-
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr ""
-
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr ""
-
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr ""
-
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr ""
-
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr ""
-
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr "എല്ലാ പ്രോഗ്രാമുകളും അടചിട്ട്‌ കംപ്യൂട്ടര്‍ പുനരാരംഭിക്കട്ടെ ?"
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr "എല്ലാ പ്രോഗ്രാമുകളും അടചിട്ട്‌ കംപ്യൂട്ടര്‍ ഷട്ട് ഡൌണ്‍ ചെയ്യട്ടെ"
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr ""
+#~ msgid "Lock Screen"
+#~ msgstr "സ്ക്രീന്‍ പൂട്ടുക"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "താത്കാലികനിദ്ര"
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "പുറത്തു കടക്കുക"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "ശിശിര നിദ്ര"
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "പുനരാരംഭിക്കുക"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "അതിഥി പ്രവര്‍ത്തന വേള"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "അടച്ചു പൂട്ടുക"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "ലോഗ് ഔട്ട് ചെയ്യുക"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "പുനരാരംഭിക്കുക"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "അടച്ചു പൂട്ടുക"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr ""
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "പുറത്തു കടക്കുക"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr ""
+#~ msgid "Restart Instead"
+#~ msgstr "പകരം പുനരാരംഭിക്കുക"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr ""
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "1"
 
 #~ msgid "Shut Down..."
 #~ msgstr "അടച്ചു പൂട്ടുക..."
@@ -297,19 +260,12 @@ msgstr ""
 #~ msgstr "പുറത്ത് പോകുക..."
 
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
-#~ msgstr ""
-#~ "പ്രവര്‍ത്തനവേളാ മെനുവില്‍ ലോഗൌട്ട് ബട്ടണ്‍ കാണിക്കാത്ത വിധത്തില്‍ "
-#~ "സജ്ജീകരിക്കുന്നു."
+#~ msgstr "പ്രവര്‍ത്തനവേളാ മെനുവില്‍ ലോഗൌട്ട് ബട്ടണ്‍ കാണിക്കാത്ത വിധത്തില്‍ സജ്ജീകരിക്കുന്നു."
 
 #~ msgctxt "button auth"
 #~ msgid "Shut Down..."
 #~ msgstr "നിര്‍ത്തിവയ്ക്കുക..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "ചില സോഫ്റ്റ്‌വെയര്‍ പുതുക്കലുകള്‍ അടുത്ത തവണ കമ്പ്യൂട്ടര്‍ "
-#~ "പുനരാരംഭിക്കുന്നത് വരെ പ്രയോഗത്തില്‍ വരില്ല."
-
 #~ msgid "Restart Instead..."
 #~ msgstr "പകരം പുനരാരംഭിക്കുക..."
 
@@ -320,20 +276,17 @@ msgstr ""
 #~ msgid "Switch User..."
 #~ msgstr "ഉപയോക്താവിനെ മാറ്റുക..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "%s -ല്‍ നിന്നും മാറുക..."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr ""
-#~ "പ്രവര്‍ത്തനവേളാ മെനുവില്‍ പുനരാരംഭിക്കുവാനുള്ള ബട്ടണ്‍ കാണിക്കാത്ത "
-#~ "വിധത്തില്‍ സജ്ജീകരിക്കുന്നു."
+#~ "പ്രവര്‍ത്തനവേളാ മെനുവില്‍ പുനരാരംഭിക്കുവാനുള്ള ബട്ടണ്‍ കാണിക്കാത്ത വിധത്തില്‍ സജ്ജീകരിക്കുന്നു."
 
 #~ msgid ""
 #~ "Makes it so that the shutdown button doesn't show in the session menu."
-#~ msgstr ""
-#~ "പ്രവര്‍ത്തനവേളാ മെനുവില്‍ ഷട്ട് ഡൗണ്‍ ബട്ടണ്‍ കാണിക്കാത്ത വിധത്തില്‍ "
-#~ "സജ്ജീകരിക്കുന്നു."
+#~ msgstr "പ്രവര്‍ത്തനവേളാ മെനുവില്‍ ഷട്ട് ഡൗണ്‍ ബട്ടണ്‍ കാണിക്കാത്ത വിധത്തില്‍ സജ്ജീകരിക്കുന്നു."
 
 #~ msgid "Session"
 #~ msgstr "സെഷന്‍"
diff --git a/po/mr.po b/po/mr.po
index d7f067e..108476d 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2011-04-12 05:44+0000\n"
 "Last-Translator: Vaibhav S Dalvi <Unknown>\n"
 "Language-Team: Marathi <mr@li.org>\n"
+"Language: mr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,273 +19,231 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr ""
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr "Log Out, Restart आणि Shutdownची खात्री करून घेणारा संदेश दाखवू नका."
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
-msgstr ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr "Log Out, Restart आणि Shutdownची खात्री करून घेणारा संदेश दाखवावा का नाही"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "सेशन मेनूमधून Log Out काढून टाका"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "सेशन मेनूमधून Restart काढून टाका"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
-msgstr "सेशन मेनूमधून Shut Down काढून टाका"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
-msgstr "Log Out, Restart आणि Shutdownची खात्री करून घेणारा संदेश दाखवू नका."
+msgid "Remove the shutdown item from the session menu"
+msgstr "सेशन मेनूमधून Shut Down काढून टाका"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
-"Log Out, Restart आणि Shutdownची खात्री करून घेणारा संदेश दाखवावा का नाही"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "पडदा कुलूपबंद करा"
-
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "पूर्णपणे बंद करा"
-
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "लॉग आउट"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "पुन्हा सुरू करा"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "लॉग आउट..."
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "बंद करून पुन्हा सुरु करा..."
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "बंद करा..."
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "बाहेर पडा"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "पुन्हा चालू करा"
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
-msgstr "पूर्णपणे बंद करा"
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
 msgstr ""
-"आपल्याला खात्री आहे कि आपणास सर्व कार्यक्रम बंद करुन संगणकाच्या बाहेर पडायचे "
-"आहे?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
 msgstr ""
-"आपल्याला खात्री आहे कि आपणास सर्व कार्यक्रम बंद करुन संगणक पुन्हा सुरु "
-"करायचा आहे?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
 msgstr ""
-"आपल्याला खात्री आहे कि आपणास सर्व कार्यक्रम बंद करुन संगणक बंद करायचा आहे?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "बाहेर पडा"
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "पुन्हा सुरू करा"
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "पाहुण्या रुपात सत्र"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "पूर्णपणे बंद करा"
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "लॉग आउट..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
-msgstr "बाहेर पडा"
+msgstr "लॉग आउट"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "स्थगित करा"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "निष्क्रिय करा"
+
+#: ../src/service.c:722
 msgid "Restart…"
-msgstr ""
+msgstr "बंद करून पुन्हा सुरु करा..."
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "पुन्हा सुरू करा"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
+#: ../src/service.c:729
 msgid "Shut Down…"
-msgstr ""
+msgstr "बंद करा..."
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "त्याऐवजी पुन्हा सुरु करा"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr "पूर्णपणे बंद करा"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
+msgstr "आपल्याला खात्री आहे कि आपणास सर्व कार्यक्रम बंद करुन संगणकाच्या बाहेर पडायचे आहे?"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr "काही प्रणाली अद्यायावने संगणक पुन्हा सुरु केल्याशिवाय कार्यान्वित होत नाहीत."
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
 msgid "Cancel"
 msgstr "रद्द करा"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "१"
-
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr ""
-
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr ""
-
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr ""
-
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr "आपल्याला खात्री आहे कि आपणास सर्व कार्यक्रम बंद करुन संगणक पुन्हा सुरु करायचा आहे?"
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr "आपल्याला खात्री आहे कि आपणास सर्व कार्यक्रम बंद करुन संगणक बंद करायचा आहे?"
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr ""
+#~ msgid "Lock Screen"
+#~ msgstr "पडदा कुलूपबंद करा"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "बाहेर पडा"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "पुन्हा चालू करा"
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "पूर्णपणे बंद करा"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "स्थगित करा"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "बाहेर पडा"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "निष्क्रिय करा"
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "पुन्हा सुरू करा"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "पाहुण्या रुपात सत्र"
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "पूर्णपणे बंद करा"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr ""
-
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr ""
-
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr ""
-
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr ""
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "बाहेर पडा"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr ""
+#~ msgid "Restart Instead"
+#~ msgstr "त्याऐवजी पुन्हा सुरु करा"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr ""
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "१"
 
 #~ msgid "Restart..."
 #~ msgstr "पुन्हा सुरू करा..."
@@ -305,22 +264,18 @@ msgstr ""
 #~ msgid "Shut Down..."
 #~ msgstr "पूर्णपणे बंद करा..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "काही प्रणाली अद्यायावने संगणक पुन्हा सुरु केल्याशिवाय कार्यान्वित होत नाहीत."
-
 #~ msgctxt "button auth"
 #~ msgid "Restart..."
 #~ msgstr "पुन्हा सुरू करा..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "%s मधून बदला..."
 
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
 #~ msgstr "logout बटन सेशन मेनूमध्ये दाखवू नका"
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "restart बटन सेशन मेनूमध्ये दाखवू नका"
 
 #~ msgid ""
diff --git a/po/ms.po b/po/ms.po
index 371b4b9..7d8bfc3 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2011-09-16 00:58+0000\n"
 "Last-Translator: abuyop <Unknown>\n"
 "Language-Team: Malay <ms@li.org>\n"
+"Language: ms\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,278 +19,311 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
 msgstr ""
-"Jadikannya supaya butang daftar keluar tidak dipaparkan dalam menu sesi."
+"Sorokkan dialog untuk mengesahkan arahan log keluar, ulanghidup dan matikan"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgid ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
-"Jadikannya supaya butang mula semula tidak dipaparkan dalam menu sesi."
+"Sama ada papar atau tidak dialog untuk mengesahkan arahan rekod keluar, mula "
+"semula dan matikan"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
-msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
-msgstr "Jadikannya supaya butang matikan tidak dipaparkan dalam menu sesi."
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
 msgid "Remove the Log Out item from the session menu"
 msgstr "Hapus item Log Out dari menu sesi."
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+"Jadikannya supaya butang daftar keluar tidak dipaparkan dalam menu sesi."
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Buang item Mula Semula daripada menu sesi"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr "Jadikannya supaya butang mula semula tidak dipaparkan dalam menu sesi."
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
 msgid "Remove the shutdown item from the session menu"
 msgstr "Buang item matikan daripada menu sesi"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr "Jadikannya supaya butang matikan tidak dipaparkan dalam menu sesi."
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"Sorokkan dialog untuk mengesahkan arahan log keluar, ulanghidup dan matikan"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
-"Sama ada papar atau tidak dialog untuk mengesahkan arahan rekod keluar, mula "
-"semula dan matikan"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "Sesi Tetamu Klasik"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "Tetamu"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "Mulakan sesi tetamu menggunakan desktop klasik"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Kunci Skrin"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Matikan"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Log Keluar"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "Tetapan Sistem..."
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "UlangHidup"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "Akaun Atas Talian..."
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Daftar Keluar..."
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Mula Semula..."
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "Tukar Akaun Pengguna..."
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Matikan..."
+#: ../src/service.c:575 ../src/service.c:591
+#, fuzzy
+msgid "Switch Account"
+msgstr "Tukar Akaun Pengguna..."
+
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "Tukar Akaun Pengguna..."
+
+#: ../src/service.c:588
+#, fuzzy
+msgid "Lock/Switch Account"
+msgstr "Tukar Akaun Pengguna..."
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Sesi Tamu"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Daftar Keluar..."
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Log Keluar"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Tangguh"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Hibernasi"
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr "Mula Semula..."
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
 msgid "Restart"
 msgstr "UlangHidup"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr "Matikan..."
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
 msgstr "Matikan"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr ""
 "Apakah anda pasti ingin menutup semua perisaian dan daftar keluar dari "
 "komputer?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+"Beberapa kemaskini perisai tidak akan berlaku sampai komputer di ulang mula "
+"seterusnya."
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "Batalkan"
+
+#: ../src/backend-dbus/actions.c:862
 msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
 "Apakah anda pasti ingin menutup semua perisaian dan ulang mula komputer?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr "Apakah anda pasti ingin menutup semua perisaian dan matikan komputer?"
+
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1008
 msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
-"Apakah anda pasti ingin menutup semua perisaian dan matikan komputer?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "Log Keluar"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "UlangHidup"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Matikan"
+#~ msgid "Classic Guest Session"
+#~ msgstr "Sesi Tetamu Klasik"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Daftar Keluar"
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "Mulakan sesi tetamu menggunakan desktop klasik"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr "Mula Semula..."
+#~ msgid "Lock Screen"
+#~ msgstr "Kunci Skrin"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr "Matikan..."
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Log Keluar"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Ulang Mula Sebaliknya"
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "UlangHidup"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "Mula Semula Jua..."
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Matikan"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
-"Beberapa kemaskini perisian tidak dilaksanakan sehingga mula semula komputer "
-"berikutnya."
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Log Keluar"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "Batalkan"
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "UlangHidup"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "1"
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Matikan"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr "Tukar Akaun Pengguna..."
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Daftar Keluar"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "Tukar Dari %s..."
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "Mula Semula..."
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "Perisian Sudah Dikemaskinikan"
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "Matikan..."
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "Kemaskini Sudah Ada..."
+#~ msgid "Restart Instead"
+#~ msgstr "Ulang Mula Sebaliknya"
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "Kemaskini Dipasangkan..."
+#~ msgid "Restart Instead…"
+#~ msgstr "Mula Semula Jua..."
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr "Mula semula untuk selesaikan kemaskini..."
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr ""
+#~ "Beberapa kemaskini perisian tidak dilaksanakan sehingga mula semula "
+#~ "komputer berikutnya."
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "Tetapan Sistem..."
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "1"
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "Paparan..."
+#~ msgid "Switch From %s…"
+#~ msgstr "Tukar Dari %s..."
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "Aplikasi Permulaan..."
+#~ msgid "Software Up to Date"
+#~ msgstr "Perisian Sudah Dikemaskinikan"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "Peranti Terlekap"
+#~ msgid "Updates Available…"
+#~ msgstr "Kemaskini Sudah Ada..."
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "Pencetak"
+#~ msgid "Updates Installing…"
+#~ msgstr "Kemaskini Dipasangkan..."
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "Pengimbas"
+#~ msgid "Restart to Complete Updates…"
+#~ msgstr "Mula semula untuk selesaikan kemaskini..."
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "Kamera Sesawang"
+#~ msgid "Displays…"
+#~ msgstr "Paparan..."
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Tangguh"
+#~ msgid "Startup Applications…"
+#~ msgstr "Aplikasi Permulaan..."
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Hibernasi"
+#~ msgid "Attached Devices"
+#~ msgstr "Peranti Terlekap"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Sesi Tamu"
+#~ msgid "Printers"
+#~ msgstr "Pencetak"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "Tetamu"
+#~ msgid "Scanners"
+#~ msgstr "Pengimbas"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "Akaun Atas Talian..."
+#~ msgid "Webcam"
+#~ msgstr "Kamera Sesawang"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "Akaun Pengguna..."
+#~ msgid "User Accounts…"
+#~ msgstr "Akaun Pengguna..."
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "Kamera Sesawang %s"
+#~ msgid "%s Webcam"
+#~ msgstr "Kamera Sesawang %s"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "Pengimbas"
+#~ msgid "Scanner"
+#~ msgstr "Pengimbas"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "Pengimbas %s"
+#~ msgid "%s Scanner"
+#~ msgstr "Pengimbas %s"
 
 #~ msgid "Restart..."
 #~ msgstr "Ulanghidup"
@@ -303,7 +337,6 @@ msgstr "Pengimbas %s"
 #~ msgid "Switch User..."
 #~ msgstr "Tukar Pengguna..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Tukar daripada %s..."
 
@@ -318,11 +351,6 @@ msgstr "Pengimbas %s"
 #~ msgid "Shut Down..."
 #~ msgstr "Matikan..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Beberapa kemaskini perisai tidak akan berlaku sampai komputer di ulang mula "
-#~ "seterusnya."
-
 #~ msgid "Restart Instead..."
 #~ msgstr "Ulang Mula Sebaliknya"
 
@@ -332,13 +360,15 @@ msgstr "Pengimbas %s"
 #~ msgid "Restart to Complete Update"
 #~ msgstr "Mula Semula untuk Menyelesaikan Kemaskini"
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr ""
 #~ "Jadikannya supaya butang mula semula tidak dipaparkan didalam menu sesi."
 
 #~ msgid ""
 #~ "Makes it so that the shutdown button doesn't show in the session menu."
-#~ msgstr "Jadikannya supaya butang matikan tidak dipaparkan didalam menu sesi."
+#~ msgstr ""
+#~ "Jadikannya supaya butang matikan tidak dipaparkan didalam menu sesi."
 
 #~ msgid "Session"
 #~ msgstr "Sesi"
diff --git a/po/my.po b/po/my.po
index 5e57c8c..6f9fb9b 100644
--- a/po/my.po
+++ b/po/my.po
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2011-07-15 06:38+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Burmese <my@li.org>\n"
+"Language: my\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,277 +19,242 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
 msgstr ""
+"အကောင့်မှထွက်ခြင်း၊ အစမှ ပြန်ဝင်ခြင်း နှင့် လုံးဝ ပိတ်ခြင်း တို့အတွက် သေချာအောင် မေးသော စာသားအား "
+"ပယ်ဖျောက်မည်"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
+"အကောင့်မှထွက်ခြင်း၊ အစမှ ပြန်ဝင်ခြင်း နှင့် လုံးဝ ပိတ်ခြင်း တို့အတွက် သေချာအောင် မေးသော စာသားအား "
+"ပယ်ဖျောက်ထားမည် သို့ မထားပါ"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "အကောင့်မှထွက်ရန် ခလုတ်အား ကဏ္ဍစာရင်းမှ ဖယ်ရှားမည်"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "အစမှ ပြန်ဖွင့််ရန် ခလုတ်အား ကဏ္ဍစာရင်းမှ ဖယ်ရှားမည်"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
-msgstr "အပြီးပိတ်ရန် ခလုတ်အား ကဏ္ဍစာရင်းမှ ဖယ်ရှားမည်"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
-msgstr ""
-"အကောင့်မှထွက်ခြင်း၊ အစမှ ပြန်ဝင်ခြင်း နှင့် လုံးဝ ပိတ်ခြင်း တို့အတွက် "
-"သေချာအောင် မေးသော စာသားအား ပယ်ဖျောက်မည်"
+msgid "Remove the shutdown item from the session menu"
+msgstr "အပြီးပိတ်ရန် ခလုတ်အား ကဏ္ဍစာရင်းမှ ဖယ်ရှားမည်"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
-"အကောင့်မှထွက်ခြင်း၊ အစမှ ပြန်ဝင်ခြင်း နှင့် လုံးဝ ပိတ်ခြင်း တို့အတွက် "
-"သေချာအောင် မေးသော စာသားအား ပယ်ဖျောက်ထားမည် သို့ မထားပါ"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "ဖန်သားပြင်ကို သော့ခတ်မည်"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "လုံးဝ ပိတ်မည်"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "အကောင့်မှ ထွက်မည်"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "အစမှ ပြန်ဖွင့်မည်"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "အကောင့်မှ ထွက်မည် ..."
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "အစမှ ပြန်ဖွင့်မည် ..."
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "လုံးဝ ပိတ်မည် ..."
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "အကောင့်မှ ထွက်မည်"
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "အစမှ ပြန်ဖွင့်မည်"
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
-msgstr "လုံးဝ ပိတ်မည်"
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
-msgstr "ပရိုဂရမ် အားလုံးကို ပိတ်၍ အကောင့်မှ ထွက်မှာ သေချာပြီလား။"
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
+#: ../src/service.c:594
+msgid "Lock"
 msgstr ""
-"ပရိုဂရမ် အားလုံးကို ပိတ်၍ ကွန်ပျူတာကို အစမှ ပြန်ဖွင့်မှာ သေချာပြီလား။"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
-msgstr "ပရိုဂရမ် အားလုံးကို ပိတ်၍ ကွန်ပျူတာကို အပြီးပိတ်မှာ သေချာပြီလား။"
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "ဧည့်သည် ကဏ္ဍ"
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "အကောင့်မှ ထွက်မည် ..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "အကောင့်မှ ထွက်မည်"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "အစမှ ပြန်ဖွင့်မည်"
-
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "လုံးဝ ပိတ်မည်"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "ဆိုင်းငံ့ထားမည်"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "အကောင့်မှ ထွက်မည်"
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "လက်ရှိ အခြေအနေတိုင်းမှတ်သား၍ အပြီးထွက်မည်"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
+#: ../src/service.c:722
 msgid "Restart…"
-msgstr ""
+msgstr "အစမှ ပြန်ဖွင့်မည် ..."
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "အစမှ ပြန်ဖွင့်မည်"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
+#: ../src/service.c:729
 msgid "Shut Down…"
-msgstr ""
+msgstr "လုံးဝ ပိတ်မည် ..."
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "အကောင့်မှထွက်မည့်အစား အစမှပြန်ဖွင့်မည်"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr "လုံးဝ ပိတ်မည်"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
+msgstr "ပရိုဂရမ် အားလုံးကို ပိတ်၍ အကောင့်မှ ထွက်မှာ သေချာပြီလား။"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
 msgstr ""
+"ကွန်ပျူတာအား နောက်ထပ် ပြန်မဖွင့်မချင်း အချို့သော ဆော့ဖ်ဝဲများအား အဆင့်မြှင့်တင်မှု ပြုလုပ်ဦးမည် မဟုတ်ပါ"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
 msgid "Cancel"
 msgstr "ပယ်ဖျက်မည်"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "၁"
-
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr ""
-
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr ""
-
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr ""
-
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr ""
-
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr ""
-
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr ""
-
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr "ပရိုဂရမ် အားလုံးကို ပိတ်၍ ကွန်ပျူတာကို အစမှ ပြန်ဖွင့်မှာ သေချာပြီလား။"
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr "ပရိုဂရမ် အားလုံးကို ပိတ်၍ ကွန်ပျူတာကို အပြီးပိတ်မှာ သေချာပြီလား။"
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr ""
+#~ msgid "Lock Screen"
+#~ msgstr "ဖန်သားပြင်ကို သော့ခတ်မည်"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "ဆိုင်းငံ့ထားမည်"
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "အကောင့်မှ ထွက်မည်"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "လက်ရှိ အခြေအနေတိုင်းမှတ်သား၍ အပြီးထွက်မည်"
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "အစမှ ပြန်ဖွင့်မည်"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "ဧည့်သည် ကဏ္ဍ"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "လုံးဝ ပိတ်မည်"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "အကောင့်မှ ထွက်မည်"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "အစမှ ပြန်ဖွင့်မည်"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "လုံးဝ ပိတ်မည်"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr ""
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "အကောင့်မှ ထွက်မည်"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr ""
+#~ msgid "Restart Instead"
+#~ msgstr "အကောင့်မှထွက်မည့်အစား အစမှပြန်ဖွင့်မည်"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr ""
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "၁"
 
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
 #~ msgstr "ကဏ္ဍစာရင်းတွင် အကောင့်မှထွက်ရန် ခလုတ်အား မပေါ်စေရန် လုပ်မည်"
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "ကဏ္ဍစာရင်းတွင် အစမှ ပြန်ဖွင့်ရန် ခလုတ်အား မပေါ်စေရန် လုပ်မည်"
 
 #~ msgid ""
@@ -312,18 +278,12 @@ msgstr ""
 #~ msgid "Shut Down..."
 #~ msgstr "လုံးဝ ပိတ်မည် ..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "ကွန်ပျူတာအား နောက်ထပ် ပြန်မဖွင့်မချင်း အချို့သော ဆော့ဖ်ဝဲများအား "
-#~ "အဆင့်မြှင့်တင်မှု ပြုလုပ်ဦးမည် မဟုတ်ပါ"
-
 #~ msgid "Session"
 #~ msgstr "ကဏ္ဍ"
 
 #~ msgid "Switch User..."
 #~ msgstr "အသုံးပြုသူ လဲမည်"
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "%s... မှ လဲလှယ်မည်"
 
diff --git a/po/nb.po b/po/nb.po
index 09c689f..d5147f6 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2011-09-19 14:25+0000\n"
 "Last-Translator: Kjetil Birkeland Moe <kjetil@skifremme.com>\n"
 "Language-Team: Norwegian Bokmal\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,273 +19,306 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr "Skjul avloggingsknappen i øktmenyen."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+"Overstyr dialogboksen for å bekrefte handlingene logg av, start på nytt og "
+"avslutt."
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr "Skjul omstartknappen i øktmenyen."
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
-msgstr "Skjul avsluttingsknappen i øktmenyen."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+"Om bekreftelsesdialogbokser for handlingene logg av, start på nytt og "
+"avslutt skal vises ."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Fjern \"Logg av\"-elementet fra øktmenyen"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr "Skjul avloggingsknappen i øktmenyen."
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Fjern omstartelementet fra øktmenyen."
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr "Skjul omstartknappen i øktmenyen."
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
 msgid "Remove the shutdown item from the session menu"
 msgstr "Fjern omstartknappen fra øktmenyen."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr "Skjul avsluttingsknappen i øktmenyen."
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"Overstyr dialogboksen for å bekrefte handlingene logg av, start på nytt og "
-"avslutt."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
-"Om bekreftelsesdialogbokser for handlingene logg av, start på nytt og "
-"avslutt skal vises ."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "Klassisk gjesteøkt"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "Gjest"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "Start en gjesteøkt med det et klassisk skrivebordsmiljø"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Lås skjerm"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Slå av"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Logg av"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "Systeminnstillinger …"
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Start på nytt"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "Nettkontoer..."
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Logg av..."
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Start på nytt..."
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "Bytt brukerkonto…"
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Slå av..."
+#: ../src/service.c:575 ../src/service.c:591
+#, fuzzy
+msgid "Switch Account"
+msgstr "Bytt brukerkonto…"
+
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "Bytt brukerkonto…"
+
+#: ../src/service.c:588
+#, fuzzy
+msgid "Lock/Switch Account"
+msgstr "Bytt brukerkonto…"
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Gjesteøkt"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Logg av..."
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Logg av"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Hvilemodus"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Dvalemodus"
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr "Start på nytt..."
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
 msgid "Restart"
 msgstr "Start på nytt"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr "Slå av..."
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
 msgstr "Slå av"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr "Ønsker du å lukke alle programmer og logge av datamaskinen?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr "Noen programvareoppdateringer trer ikke i kraft før etter en omstart."
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: ../src/backend-dbus/actions.c:862
 msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr "Ønsker du å lukke alle programmer og starte datamaskinen på nytt?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr "Ønsker du å lukke alle programmer og slå av datamaskinen?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "Logg av"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Start på nytt"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Slå av"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Logg av"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr "Start på nytt..."
+#~ msgid "Classic Guest Session"
+#~ msgstr "Klassisk gjesteøkt"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr "Slå av..."
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "Start en gjesteøkt med det et klassisk skrivebordsmiljø"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Start på nytt i stedet"
+#~ msgid "Lock Screen"
+#~ msgstr "Lås skjerm"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "Start på nytt istedet..."
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Logg av"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
-"Noen programvareoppdateringer trer ikke i kraft før datamaskinen er startet "
-"på nytt."
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Start på nytt"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "Avbryt"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Slå av"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "1"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Logg av"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr "Bytt brukerkonto…"
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Start på nytt"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "Bytt fra %s..."
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Slå av"
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "Programvaren er oppdatert"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Logg av"
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "Oppdateringer er tilgjengelige …"
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "Start på nytt..."
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "Installerer oppdateringer …"
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "Slå av..."
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr "Oppdatering krever omstart..."
+#~ msgid "Restart Instead"
+#~ msgstr "Start på nytt i stedet"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "Systeminnstillinger …"
+#~ msgid "Restart Instead…"
+#~ msgstr "Start på nytt istedet..."
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "Skjermer..."
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr ""
+#~ "Noen programvareoppdateringer trer ikke i kraft før datamaskinen er "
+#~ "startet på nytt."
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "Oppstartsprogrammer …"
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "1"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "Tilkoblede enheter"
+#~ msgid "Switch From %s…"
+#~ msgstr "Bytt fra %s..."
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "Skrivere"
+#~ msgid "Software Up to Date"
+#~ msgstr "Programvaren er oppdatert"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "Skannere"
+#~ msgid "Updates Available…"
+#~ msgstr "Oppdateringer er tilgjengelige …"
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "Nettkamera"
+#~ msgid "Updates Installing…"
+#~ msgstr "Installerer oppdateringer …"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Hvilemodus"
+#~ msgid "Restart to Complete Updates…"
+#~ msgstr "Oppdatering krever omstart..."
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Dvalemodus"
+#~ msgid "Displays…"
+#~ msgstr "Skjermer..."
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Gjesteøkt"
+#~ msgid "Startup Applications…"
+#~ msgstr "Oppstartsprogrammer …"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "Gjest"
+#~ msgid "Attached Devices"
+#~ msgstr "Tilkoblede enheter"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "Nettkontoer..."
+#~ msgid "Printers"
+#~ msgstr "Skrivere"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "Brukerkontoer..."
+#~ msgid "Scanners"
+#~ msgstr "Skannere"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "%s Webkamera"
+#~ msgid "Webcam"
+#~ msgstr "Nettkamera"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "Skanner"
+#~ msgid "User Accounts…"
+#~ msgstr "Brukerkontoer..."
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "%s Skanner"
+#~ msgid "%s Webcam"
+#~ msgstr "%s Webkamera"
+
+#~ msgid "Scanner"
+#~ msgstr "Skanner"
+
+#~ msgid "%s Scanner"
+#~ msgstr "%s Skanner"
 
 #~ msgid "Restart..."
 #~ msgstr "Start på nytt..."
@@ -295,10 +329,6 @@ msgstr "%s Skanner"
 #~ msgid "Switch User..."
 #~ msgstr "Bytt bruker..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Noen programvareoppdateringer trer ikke i kraft før etter en omstart."
-
 #~ msgid "Restart Instead..."
 #~ msgstr "Start på nytt i stedet ..."
 
@@ -309,7 +339,6 @@ msgstr "%s Skanner"
 #~ msgid "Log Out..."
 #~ msgstr "Logg av..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Bytt fra %s..."
 
@@ -320,7 +349,8 @@ msgstr "%s Skanner"
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
 #~ msgstr "Skjul avloggingsknappen i øktmenyen."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "Skjul omstartknappen i øktmenyen."
 
 #~ msgid ""
diff --git a/po/ne.po b/po/ne.po
index e7711d1..e329ab9 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2010-05-05 09:25+0000\n"
 "Last-Translator: Rabi Poudyal <ubuntu@rabipoudel.com.np>\n"
 "Language-Team: Nepali <ne@li.org>\n"
+"Language: ne\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,272 +19,231 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "सत्र सूचीबाट लगआउट बटन हटाउनुहोस्"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgid "Remove the shutdown item from the session menu"
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "पर्दामा ताल्चा लगाउनुहोस्"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "बन्द गर्नुहोस्"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "लगआउट गर्नुहोस्"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "पुन: सुरु गर्नुहोस्"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
+#: ../src/service.c:361
+msgid "System Settings…"
 msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
+#: ../src/service.c:363
+msgid "Online Accounts…"
 msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
+#: ../src/service.c:566
+msgid "Start Screen Saver"
 msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "लगआउट गर्नुहोस्"
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "पुन: सुरु गर्नुहोस्"
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
-msgstr "बन्द गर्नुहोस्"
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
 msgstr ""
-"के तपाई आफ्नो सबै कार्यक्रमहरू बन्द गर्न तथा कम्प्युटरबाट लगआउट हुन "
-"चाहनुहुन्छ?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
+#: ../src/service.c:594
+msgid "Lock"
 msgstr ""
-"के तपाई आफ्नो सबै कार्यक्रमहरू बन्द गर्न तथा कम्प्युटर पुनः सुरु गर्न "
-"चाहनुहुन्छ?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "अतिथि सत्र"
+
+#: ../src/service.c:696
+msgid "Log Out…"
 msgstr ""
-"के तपाई आफ्नो सबै कार्यक्रमहरू बन्द गर्न तथा कम्प्युटर बन्द गर्न चाहनुहुन्छ?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "लगआउट गर्नुहोस्"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "पुन: सुरु गर्नुहोस्"
-
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "बन्द गर्नुहोस्"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "निलम्बन गर्नुहोस्"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "लगआउट गर्नुहोस्"
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "हाइबर्नेट गर्नुहोस्"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
+#: ../src/service.c:722
 msgid "Restart…"
 msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "पुन: सुरु गर्नुहोस्"
+
+#: ../src/service.c:729
 msgid "Shut Down…"
 msgstr ""
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "तुरुन्त पुनः सुरु गर्नुहोस्"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr "बन्द गर्नुहोस्"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
+msgstr "के तपाई आफ्नो सबै कार्यक्रमहरू बन्द गर्न तथा कम्प्युटरबाट लगआउट हुन चाहनुहुन्छ?"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr "जबसम्म कम्प्युटर पुनः सुरु हुँदैन केही सफ्टवेयर अद्यावधि लागू हुनेछैन।"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
 msgid "Cancel"
 msgstr "रद्द गर्नुहोस्"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "१"
-
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr ""
-
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr ""
-
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr ""
-
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr ""
-
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr ""
-
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr "के तपाई आफ्नो सबै कार्यक्रमहरू बन्द गर्न तथा कम्प्युटर पुनः सुरु गर्न चाहनुहुन्छ?"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr "के तपाई आफ्नो सबै कार्यक्रमहरू बन्द गर्न तथा कम्प्युटर बन्द गर्न चाहनुहुन्छ?"
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr ""
+#~ msgid "Lock Screen"
+#~ msgstr "पर्दामा ताल्चा लगाउनुहोस्"
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "लगआउट गर्नुहोस्"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "निलम्बन गर्नुहोस्"
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "पुन: सुरु गर्नुहोस्"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "हाइबर्नेट गर्नुहोस्"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "बन्द गर्नुहोस्"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "अतिथि सत्र"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "लगआउट गर्नुहोस्"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "पुन: सुरु गर्नुहोस्"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "बन्द गर्नुहोस्"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr ""
-
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr ""
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "लगआउट गर्नुहोस्"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr ""
+#~ msgid "Restart Instead"
+#~ msgstr "तुरुन्त पुनः सुरु गर्नुहोस्"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr ""
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "१"
 
 #~ msgid "Shut Down..."
 #~ msgstr "बन्द गर्नुहोस्..."
@@ -301,10 +261,6 @@ msgstr ""
 #~ msgid "Shut Down..."
 #~ msgstr "बन्द गर्नुहोस्..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "जबसम्म कम्प्युटर पुनः सुरु हुँदैन केही सफ्टवेयर अद्यावधि लागू हुनेछैन।"
-
 #~ msgid "Restart Instead..."
 #~ msgstr "तुरुन्त पुनः सुरु गर्नुहोस्..."
 
@@ -312,7 +268,6 @@ msgstr ""
 #~ msgid "Restart..."
 #~ msgstr "पुनः सुरु गर्नुहोस्..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "%s बाट बदल्नुहोस्..."
 
diff --git a/po/nl.po b/po/nl.po
index ac72dfa..7fed340 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2011-09-17 19:40+0000\n"
 "Last-Translator: rob <linuxned@gmail.com>\n"
 "Language-Team: Dutch\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,279 +19,314 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
 msgstr ""
-"Zorgt ervoor dat de knop Afmelden niet wordt getoond in het sessiemenu."
+"Verhinderen dat het dialoogvenster een bevestiging voor afmelden, herstarten "
+"en afsluiten toont"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-"Zorgt ervoor dat de knop Herstarten niet wordt getoond in het sessiemenu."
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
-"Zorgt ervoor dat de knop Uitschakelen niet wordt getoond in het sessiemenu."
+"Een bevestiging voor afmelden, herstarten en afsluiten wel of niet weergeven."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "De knop Afmelden verbergen in het sessiemenu"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+"Zorgt ervoor dat de knop Afmelden niet wordt getoond in het sessiemenu."
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "De knop Herstarten verbergen in het sessiemenu"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
+"Zorgt ervoor dat de knop Herstarten niet wordt getoond in het sessiemenu."
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
 msgid "Remove the shutdown item from the session menu"
 msgstr "De knop Afsluiten verbergen in het sessiemenu"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
-"Verhinderen dat het dialoogvenster een bevestiging voor afmelden, herstarten "
-"en afsluiten toont"
+"Zorgt ervoor dat de knop Uitschakelen niet wordt getoond in het sessiemenu."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"Een bevestiging voor afmelden, herstarten en afsluiten wel of niet weergeven."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "Klassieke gastsessie"
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "Start een gastsessie met de klassieke werkomgeving"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "Gast"
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Scherm vergrendelen"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Afsluiten"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Afmelden"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Herstarten"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "Systeeminstellingen…"
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Afmelden…"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "Online accounts…"
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Herstarten…"
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Afsluiten…"
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "Gebruiker wisselen…"
+
+#: ../src/service.c:575 ../src/service.c:591
+#, fuzzy
+msgid "Switch Account"
+msgstr "Gebruiker wisselen…"
+
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "Gebruiker wisselen…"
+
+#: ../src/service.c:588
+#, fuzzy
+msgid "Lock/Switch Account"
+msgstr "Gebruiker wisselen…"
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Gastsessie"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Afmelden…"
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Afmelden"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Pauzestand"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Slaapstand"
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr "Herstarten…"
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
 msgid "Restart"
 msgstr "Herstarten"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr "Afsluiten…"
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
 msgstr "Afsluiten"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr ""
 "Weet u zeker dat u alle programma's wilt afsluiten en uzelf van de computer "
 "wilt afmelden?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+"Sommige updates worden niet doorgevoerd totdat de computer wordt herstart."
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "Annuleren"
+
+#: ../src/backend-dbus/actions.c:862
 msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
 "Weet u zeker dat u alle programma's wilt afsluiten en de computer wilt "
 "herstarten?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
 "Weet u zeker dat u alle programma's wilt afsluiten en de computer wilt "
 "uitzetten?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "Afmelden"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Herstarten"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Afsluiten"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Afmelden"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr "Herstarten…"
+#~ msgid "Classic Guest Session"
+#~ msgstr "Klassieke gastsessie"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr "Afsluiten…"
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "Start een gastsessie met de klassieke werkomgeving"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Toch herstarten"
+#~ msgid "Lock Screen"
+#~ msgstr "Scherm vergrendelen"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "In plaats hiervan herstarten…"
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Afmelden"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr "Sommige software-updates zullen pas van kracht zijn na een herstart."
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Herstarten"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "Annuleren"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Afsluiten"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "Waar"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Afmelden"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr "Gebruiker wisselen…"
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Herstarten"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "Wisselen van %s…"
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Afsluiten"
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "Software bijgewerkt"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Afmelden"
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "Updates beschikbaar…"
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "Herstarten…"
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "Updates installeren…"
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "Afsluiten…"
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr "Herstarten om updates te voltooien…"
+#~ msgid "Restart Instead"
+#~ msgstr "Toch herstarten"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "Systeeminstellingen…"
+#~ msgid "Restart Instead…"
+#~ msgstr "In plaats hiervan herstarten…"
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "Schermen…"
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr ""
+#~ "Sommige software-updates zullen pas van kracht zijn na een herstart."
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "Opstarttoepassingen…"
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "Waar"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "Aangesloten apparaten"
+#~ msgid "Switch From %s…"
+#~ msgstr "Wisselen van %s…"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "Printers"
+#~ msgid "Software Up to Date"
+#~ msgstr "Software bijgewerkt"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "Scanners"
+#~ msgid "Updates Available…"
+#~ msgstr "Updates beschikbaar…"
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "Webcam"
+#~ msgid "Updates Installing…"
+#~ msgstr "Updates installeren…"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Pauzestand"
+#~ msgid "Restart to Complete Updates…"
+#~ msgstr "Herstarten om updates te voltooien…"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Slaapstand"
+#~ msgid "Displays…"
+#~ msgstr "Schermen…"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Gastsessie"
+#~ msgid "Startup Applications…"
+#~ msgstr "Opstarttoepassingen…"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "Gast"
+#~ msgid "Attached Devices"
+#~ msgstr "Aangesloten apparaten"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "Online accounts…"
+#~ msgid "Printers"
+#~ msgstr "Printers"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "Gebruikersaccounts…"
+#~ msgid "Scanners"
+#~ msgstr "Scanners"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "%s webcam"
+#~ msgid "Webcam"
+#~ msgstr "Webcam"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "Scanner"
+#~ msgid "User Accounts…"
+#~ msgstr "Gebruikersaccounts…"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "%s scanner"
+#~ msgid "%s Webcam"
+#~ msgstr "%s webcam"
+
+#~ msgid "Scanner"
+#~ msgstr "Scanner"
+
+#~ msgid "%s Scanner"
+#~ msgstr "%s scanner"
 
 #~ msgid "Restart..."
 #~ msgstr "Herstarten…"
@@ -305,36 +341,32 @@ msgstr "%s scanner"
 #~ msgid "Restart..."
 #~ msgstr "Herstarten…"
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Sommige updates worden niet doorgevoerd totdat de computer wordt herstart."
-
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
 #~ msgstr ""
-#~ "Zorgt ervoor dat de knop om af te melden niet meer wordt weergegeven in het "
-#~ "sessiemenu."
+#~ "Zorgt ervoor dat de knop om af te melden niet meer wordt weergegeven in "
+#~ "het sessiemenu."
 
 #~ msgctxt "button auth"
 #~ msgid "Shut Down..."
 #~ msgstr "Afsluiten…"
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Wisselen van %s…"
 
 #~ msgid "Restart Instead..."
 #~ msgstr "Toch herstarten…"
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr ""
-#~ "Zorgt ervoor dat de knop om te herstarten niet meer wordt weergegeven in het "
-#~ "sessiemenu."
+#~ "Zorgt ervoor dat de knop om te herstarten niet meer wordt weergegeven in "
+#~ "het sessiemenu."
 
 #~ msgid ""
 #~ "Makes it so that the shutdown button doesn't show in the session menu."
 #~ msgstr ""
-#~ "Zorgt ervoor dat de knop om af te sluiten niet meer wordt weergegeven in het "
-#~ "sessiemenu."
+#~ "Zorgt ervoor dat de knop om af te sluiten niet meer wordt weergegeven in "
+#~ "het sessiemenu."
 
 #~ msgid "Restart to Complete Update"
 #~ msgstr "Herstart om de update te voltooien"
diff --git a/po/nn.po b/po/nn.po
index bb1e784..8faf4e7 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2011-03-26 13:04+0000\n"
 "Last-Translator: Rune Gangstø <runegang@gmail.com>\n"
 "Language-Team: Norwegian Nynorsk <nn@li.org>\n"
+"Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,283 +19,245 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
 msgstr ""
+"Ikkje vis vindauget for stadfesting av utlogging, omstart og avslutning."
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
+"Om vindauget for stadfesting av utlogging, omstart og avslutning skal visast."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Fjern «Logg ut»-oppføringa frå øktmenyen"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Fjern «Start på nytt»-oppføringa frå øktmenyen"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
 msgid "Remove the shutdown item from the session menu"
 msgstr "Fjern «Slå av»-oppføringa frå øktmenyen"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
-"Ikkje vis vindauget for stadfesting av utlogging, omstart og avslutning."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"Om vindauget for stadfesting av utlogging, omstart og avslutning skal visast."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
+#: ../src/service.c:325
+msgid "Guest"
 msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Lås skjermen"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Slå av"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Logg ut"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Start på nytt"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Logg ut …"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Start på nytt …"
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Slå av …"
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "Logg ut"
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "Start på nytt"
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
-msgstr "Slå av"
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
-msgstr "Vil du lukke alle opne program og logge av datamaskina?"
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
-msgstr "Vil du lukke alle opne program og starte datamaskina på nytt?"
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Gjesteøkt"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
-msgstr "Vil du lukke alle opne program og slå av datamaskina?"
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Logg ut …"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Logg ut"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Start på nytt"
-
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Slå av"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Kvilemodus"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Logg ut"
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Dvalemodus"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
+#: ../src/service.c:722
 msgid "Restart…"
-msgstr ""
+msgstr "Start på nytt …"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "Start på nytt"
+
+#: ../src/service.c:729
 msgid "Shut Down…"
-msgstr ""
+msgstr "Slå av …"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Start på nytt i staden"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr "Slå av"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
+msgstr "Vil du lukke alle opne program og logge av datamaskina?"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
 msgstr ""
+"Nokre programvareoppdateringar vil ikkje tre i kraft før datamaskina vert "
+"starta på nytt."
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "1"
-
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr ""
-
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr ""
-
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr ""
-
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr ""
-
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr "Vil du lukke alle opne program og starte datamaskina på nytt?"
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr "Vil du lukke alle opne program og slå av datamaskina?"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr ""
+#~ msgid "Lock Screen"
+#~ msgstr "Lås skjermen"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Logg ut"
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Start på nytt"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Kvilemodus"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Slå av"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Dvalemodus"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Logg ut"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Gjesteøkt"
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Start på nytt"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Slå av"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr ""
-
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr ""
-
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr ""
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Logg ut"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr ""
+#~ msgid "Restart Instead"
+#~ msgstr "Start på nytt i staden"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr ""
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "1"
 
 #~ msgctxt "button auth"
 #~ msgid "Shut Down..."
 #~ msgstr "Slå av …"
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Nokre programvareoppdateringar vil ikkje tre i kraft før datamaskina vert "
-#~ "starta på nytt."
-
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
 #~ msgstr "Gjer slik at «Logg ut»-knappen ikkje visast i øktmenyen."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "Gjer slik at «Start på nytt»-knappen ikkje visast i øktmenyen."
 
 #~ msgid ""
@@ -323,7 +286,6 @@ msgstr ""
 #~ msgid "Switch User..."
 #~ msgstr "Byt brukar …"
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Byt frå %s …"
 
diff --git a/po/oc.po b/po/oc.po
index 7fb903b..cfc58e1 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2011-09-16 06:27+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,282 +19,316 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
 msgstr ""
-"Fa en sòrta que lo boton de desconnexion siá pas afichat dins lo menut de la "
-"sesilha."
+"Suprimir la bóstia de dialòg de confirmacion per la fin de sesilha, "
+"l'atudament e lo reamodament"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-"Fa en sòrta que lo boton de reamodament siá pas afichat dins lo menut de la "
-"sesilha."
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
-"Fa en sòrta que lo boton d'atudament siá pas afichat dins lo menut de la "
-"sesilha."
+"Afichar o pas la bóstia de dialòg de confirmacion per la fin de sesilha, "
+"l'atudament e lo reamodament"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Suprimir la tampadura de sesilha del menut"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+"Fa en sòrta que lo boton de desconnexion siá pas afichat dins lo menut de la "
+"sesilha."
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Suprimís l'opcion de reaviada del menut"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
+"Fa en sòrta que lo boton de reamodament siá pas afichat dins lo menut de la "
+"sesilha."
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
 msgid "Remove the shutdown item from the session menu"
 msgstr "Suprimís l'opcion d'arrèst del menut"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
-"Suprimir la bóstia de dialòg de confirmacion per la fin de sesilha, "
-"l'atudament e lo reamodament"
+"Fa en sòrta que lo boton d'atudament siá pas afichat dins lo menut de la "
+"sesilha."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"Afichar o pas la bóstia de dialòg de confirmacion per la fin de sesilha, "
-"l'atudament e lo reamodament"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "Sesilha Convidat Classica"
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "Aviar una sesilha convidat en utilizant lo burèu classic"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "Convidat"
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Varrolhar l'ecran"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Atudar"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Tampar la sesilha"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Tornar amodar"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "Paramètres del Sistèma..."
+
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "Comptes en linha..."
+
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
+
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "Cambiar de compte d'utilizaire..."
+
+#: ../src/service.c:575 ../src/service.c:591
+#, fuzzy
+msgid "Switch Account"
+msgstr "Cambiar de compte d'utilizaire..."
+
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "Cambiar de compte d'utilizaire..."
+
+#: ../src/service.c:588
+#, fuzzy
+msgid "Lock/Switch Account"
+msgstr "Cambiar de compte d'utilizaire..."
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Sesilha convidat"
+
+#: ../src/service.c:696
 msgid "Log Out…"
 msgstr "Se desconnectar..."
 
-#: ../src/settings-helper.c:89
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
+msgid "Log Out"
+msgstr "Tampar la sesilha"
+
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Metre en velha"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Ivernar"
+
+#: ../src/service.c:722
 msgid "Restart…"
 msgstr "Reamodar..."
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "Tornar amodar"
+
+#: ../src/service.c:729
 msgid "Shut Down…"
 msgstr "Atudar..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "Tampadura de sesilha"
-
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "Reamodament"
-
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
-msgstr "Atudament"
+msgstr "Atudar"
+
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
+msgstr "Sètz segur que volètz quitar totes los programas e tampar la sesilha ?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
 msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+"Some software updates won't be applied until the computer next restarts."
 msgstr ""
-"Sètz segur que volètz quitar totes los programas e tampar la sesilha ?"
+"D'unas mesas a jorn logicialas seràn pas efectivas qu'aprèp un reamodament "
+"de l'ordenador."
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "Anullar"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
+#: ../src/backend-dbus/actions.c:862
 msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
 "Sètz segur que volètz quitar totes los programas e reamodar l'ordenador ?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
 "Sètz segur que volètz quitar totes los programas e atudar l'ordenador ?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "Tampar la sesilha"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Tornar amodar"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Atudar"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Tampadura de sesilha"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr "Reamodar..."
+#~ msgid "Classic Guest Session"
+#~ msgstr "Sesilha Convidat Classica"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr "Atudar..."
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "Aviar una sesilha convidat en utilizant lo burèu classic"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Tornar amodar"
+#~ msgid "Lock Screen"
+#~ msgstr "Varrolhar l'ecran"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "Reamodar a la plaça..."
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Tampadura de sesilha"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
-"D'unas mesas a jorn logicialas s'aplicaràn pas tant que l'ordenador serà pas "
-"estat reamodat."
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Reamodament"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "Anullar"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Atudament"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "1"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Tampar la sesilha"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr "Cambiar de compte d'utilizaire..."
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Tornar amodar"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "Cambiar dempuèi %s…"
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Atudar"
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "Logicial a jorn"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Tampadura de sesilha"
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "Mesas a jorn disponiblas..."
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "Reamodar..."
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "Mesas a jorn en cors d'installacion..."
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "Atudar..."
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr "Reamodar per acabar las mesas a jorn..."
+#~ msgid "Restart Instead"
+#~ msgstr "Tornar amodar"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "Paramètres del Sistèma..."
+#~ msgid "Restart Instead…"
+#~ msgstr "Reamodar a la plaça..."
+
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr ""
+#~ "D'unas mesas a jorn logicialas s'aplicaràn pas tant que l'ordenador serà "
+#~ "pas estat reamodat."
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "Afichatges..."
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "1"
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "Aplicacions a l'aviada..."
+#~ msgid "Switch From %s…"
+#~ msgstr "Cambiar dempuèi %s…"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "Periferics estacats"
+#~ msgid "Software Up to Date"
+#~ msgstr "Logicial a jorn"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "Estampadoiras"
+#~ msgid "Updates Available…"
+#~ msgstr "Mesas a jorn disponiblas..."
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "Scanners"
+#~ msgid "Updates Installing…"
+#~ msgstr "Mesas a jorn en cors d'installacion..."
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "Webcam"
+#~ msgid "Restart to Complete Updates…"
+#~ msgstr "Reamodar per acabar las mesas a jorn..."
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Metre en velha"
+#~ msgid "Displays…"
+#~ msgstr "Afichatges..."
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Ivernar"
+#~ msgid "Startup Applications…"
+#~ msgstr "Aplicacions a l'aviada..."
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Sesilha convidat"
+#~ msgid "Attached Devices"
+#~ msgstr "Periferics estacats"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "Convidat"
+#~ msgid "Printers"
+#~ msgstr "Estampadoiras"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "Comptes en linha..."
+#~ msgid "Scanners"
+#~ msgstr "Scanners"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "Comptes d'utilizaires…"
+#~ msgid "Webcam"
+#~ msgstr "Webcam"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "Webcam %s"
+#~ msgid "User Accounts…"
+#~ msgstr "Comptes d'utilizaires…"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "Scanner"
+#~ msgid "%s Webcam"
+#~ msgstr "Webcam %s"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "Scanner %s"
+#~ msgid "Scanner"
+#~ msgstr "Scanner"
+
+#~ msgid "%s Scanner"
+#~ msgstr "Scanner %s"
 
 #~ msgid "Log Out..."
 #~ msgstr "Se desconnectar..."
@@ -311,27 +346,23 @@ msgstr "Scanner %s"
 #~ msgid "Restart..."
 #~ msgstr "Tornar amodar..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "D'unas mesas a jorn logicialas seràn pas efectivas qu'aprèp un reamodament "
-#~ "de l'ordenador."
-
 #~ msgid "Restart Instead..."
 #~ msgstr "Tornar amodar..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Cambiar dempuèi %s…"
 
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
 #~ msgstr ""
-#~ "Far en sòrta que lo boton de tampadura de sesilha aparesca pas dins lo menut."
+#~ "Far en sòrta que lo boton de tampadura de sesilha aparesca pas dins lo "
+#~ "menut."
 
 #~ msgctxt "button auth"
 #~ msgid "Shut Down..."
 #~ msgstr "Atudar..."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "Fa en sòrta que lo boton de reaviada aparesca pas dins lo menut."
 
 #~ msgid ""
diff --git a/po/os.po b/po/os.po
index 5bac0ed..a75968a 100644
--- a/po/os.po
+++ b/po/os.po
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2011-05-21 19:42+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Ossetian <os@li.org>\n"
+"Language: os\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,274 +19,230 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Æттæмæхизæн менюйæ аппарын"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Нæуæгæй иу гæнæн менюйæ аппарын"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
-msgstr "Хицæнгæнæн менюйæ æппарын"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
-msgstr ""
+msgid "Remove the shutdown item from the session menu"
+msgstr "Хицæнгæнæн менюйæ æппарын"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
+#: ../src/service.c:325
+msgid "Guest"
 msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Ахицæн кæнын"
-
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Æттæмæ ахизын"
-
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Нæуæгæй баиу кæнын"
-
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
 msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
 msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
+#: ../src/service.c:346
+msgid "About This Computer"
 msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "Æттæмæ ахизын"
-
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "Нæуæгæй баиу кæнын"
-
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
-msgstr "Ахицæн кæнын"
-
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
-msgstr "Æцæг дæ фæнды алы программæ дæр сыхкæнын, æмæ æттæмæ рахизын?"
-
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
+#: ../src/service.c:361
+msgid "System Settings…"
 msgstr ""
-"Æцæг дæ фæнды алы программæ дæр сыхкæнын, æмæ компьютер нæуæгæй баиу кæнын?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/service.c:363
+msgid "Online Accounts…"
 msgstr ""
-"Æцæг дæ фæнды алы программæ дæр сыхкæнын, æмæ компьютер ахицæн кæнын?"
-
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "Æттæмæ ахизын"
-
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Нæуæгæй баиу кæнын"
-
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Ахицæн кæнын"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Æттæмæ ахизын"
-
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
+#: ../src/service.c:566
+msgid "Start Screen Saver"
 msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
 msgstr ""
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Уый бæсты нæуæгæй баиу кæнын"
-
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
 msgstr ""
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
 msgstr ""
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
 msgstr ""
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
+#: ../src/service.c:594
+msgid "Lock"
 msgstr ""
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
+#: ../src/service.c:619
+msgid "Guest Session"
 msgstr ""
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
+#: ../src/service.c:696
+msgid "Log Out…"
 msgstr ""
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr ""
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
+msgid "Log Out"
+msgstr "Æттæмæ ахизын"
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
+#: ../src/service.c:714
+msgid "Suspend"
 msgstr ""
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
+#: ../src/service.c:717
+msgid "Hibernate"
 msgstr ""
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
+#: ../src/service.c:722
+msgid "Restart…"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr ""
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "Нæуæгæй баиу кæнын"
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
+#: ../src/service.c:729
+msgid "Shut Down…"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr ""
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr "Ахицæн кæнын"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr ""
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
+msgstr "Æцæг дæ фæнды алы программæ дæр сыхкæнын, æмæ æттæмæ рахизын?"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
+#: ../src/backend-dbus/actions.c:819
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
 msgstr ""
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
+"Æцæг дæ фæнды алы программæ дæр сыхкæнын, æмæ компьютер нæуæгæй баиу кæнын?"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr ""
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr "Æцæг дæ фæнды алы программæ дæр сыхкæнын, æмæ компьютер ахицæн кæнын?"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Æттæмæ ахизын"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Нæуæгæй баиу кæнын"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Ахицæн кæнын"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Æттæмæ ахизын"
+
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Нæуæгæй баиу кæнын"
+
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Ахицæн кæнын"
+
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Æттæмæ ахизын"
+
+#~ msgid "Restart Instead"
+#~ msgstr "Уый бæсты нæуæгæй баиу кæнын"
 
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
 #~ msgstr "Æмбæхсы менюйæ æттæмæхизæны."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "Æмбæхсы менюйæ нæуæгæй баиу кæнæны."
 
 #~ msgid ""
diff --git a/po/pa.po b/po/pa.po
index 3441ec1..d6c8e65 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2010-12-29 22:49+0000\n"
 "Last-Translator: Ken VanDine <ken.vandine@canonical.com>\n"
 "Language-Team: Punjabi <pa@li.org>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,269 +19,231 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr ""
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr "ਲਾਗਆਉਟ, ਮੁੜ-ਚਾਲੂ ਕਰਨ ਅਤੇ ਬੰਦ ਕਰਨ ਵਾਸਤੇ ਡਾਈਲਾਗ ਉੱਤੇ ਪੁਸ਼ਟੀ ਕਰੋ"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
-msgstr ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr "ਕੀ ਲਾਗਆਉਟ, ਮੁੜ-ਚਾਲੂ ਤੇ ਬੰਦ ਕਰੋ ਕਾਰਵਾਈ ਲਈ ਪੁਸ਼ਟੀ ਡਾਈਲਾਗ ਵੇਖਣਾ ਹੈ ਜਾਂ ਨਹੀਂ।"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "ਸ਼ੈਸ਼ਨ ਮੇਨੂ ਤੋਂ ਲਾਗ ਆਉਟ ਆਈਟਮ ਹਟਾਓ"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "ਸ਼ੈਸ਼ਨ ਮੇਨੂ ਤੋਂ ਮੁੜ-ਚਾਲੂ ਕਰੋ ਆਈਟਮ ਹਟਾਓ"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
-msgstr "ਸ਼ੈਸ਼ਨ ਮੇਨੂ ਤੋਂ ਬੰਦ ਕਰੋ ਆਈਟਮ ਹਟਾਓ"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
-msgstr "ਲਾਗਆਉਟ, ਮੁੜ-ਚਾਲੂ ਕਰਨ ਅਤੇ ਬੰਦ ਕਰਨ ਵਾਸਤੇ ਡਾਈਲਾਗ ਉੱਤੇ ਪੁਸ਼ਟੀ ਕਰੋ"
+msgid "Remove the shutdown item from the session menu"
+msgstr "ਸ਼ੈਸ਼ਨ ਮੇਨੂ ਤੋਂ ਬੰਦ ਕਰੋ ਆਈਟਮ ਹਟਾਓ"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
-"ਕੀ ਲਾਗਆਉਟ, ਮੁੜ-ਚਾਲੂ ਤੇ ਬੰਦ ਕਰੋ ਕਾਰਵਾਈ ਲਈ ਪੁਸ਼ਟੀ ਡਾਈਲਾਗ ਵੇਖਣਾ ਹੈ ਜਾਂ ਨਹੀਂ।"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "ਸਕਰੀਨ ਲਾਕ ਕਰੋ"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "ਬੰਦ ਕਰੋ"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "ਲਾਗ ਆਉਟ"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "ਮੁੜ-ਚਾਲੂ"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "ਲਾਗ ਆਉਟ..."
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "ਮੁੜ-ਚਾਲੂ..."
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "ਬੰਦ ਕਰੋ..."
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "ਲਾਗ ਆਉਟ"
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "ਮੁੜ-ਚਾਲੂ"
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
-msgstr "ਬੰਦ ਕਰੋ"
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
 msgstr ""
-"ਕੀ ਤੁਸੀਂ ਆਪਣੇ ਸਾਰੇ ਪਰੋਗਰਾਮ ਬੰਦ ਕਰਕੇ ਕੰਪਿਊਟਰ ਤੋਂ ਲਾਗਆਉਟ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
-msgstr "ਕੀ ਤੁਸੀਂ ਸਾਰੇ ਪਰੋਗਰਾਮ ਬੰਦ ਕਰਕੇ ਕੰਪਿਊਟਰ ਨੂੰ ਮੁੜ-ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
-msgstr "ਕੀ ਤੁਸੀਂ ਸਭ ਪਰੋਗਰਾਮ ਬੰਦ ਕਰਕੇ ਕੰਪਿਊਟਰ ਨੂੰ ਬੰਦ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "ਮਹਿਮਾਨ ਸ਼ੈਸ਼ਨ"
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "ਲਾਗ ਆਉਟ..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "ਲਾਗ ਆਉਟ"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "ਮੁੜ-ਚਾਲੂ"
-
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "ਬੰਦ ਕਰੋ"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "ਸਸਪੈਂਡ"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "ਲਾਗ ਆਉਟ"
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "ਹਾਈਬਰਨੇਟ"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
+#: ../src/service.c:722
 msgid "Restart…"
-msgstr ""
+msgstr "ਮੁੜ-ਚਾਲੂ..."
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "ਮੁੜ-ਚਾਲੂ"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
+#: ../src/service.c:729
 msgid "Shut Down…"
-msgstr ""
+msgstr "ਬੰਦ ਕਰੋ..."
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "ਇਸ ਦੀ ਬਜਾਏ ਮੁੜ-ਚਾਲੂ"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr "ਬੰਦ ਕਰੋ"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
+msgstr "ਕੀ ਤੁਸੀਂ ਆਪਣੇ ਸਾਰੇ ਪਰੋਗਰਾਮ ਬੰਦ ਕਰਕੇ ਕੰਪਿਊਟਰ ਤੋਂ ਲਾਗਆਉਟ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr "ਕੁਝ ਸਾਫਟਵੇਅਰ ਅੱਪਡੇਟ ਕੰਪਿਊਟਰ ਦੇ ਮੁੜ-ਚਾਲੂ ਹੋਣ ਤੱਕ ਅੱਪਡੇਟ ਨਹੀਂ ਹੋਣਗੇ।"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
 msgid "Cancel"
 msgstr "ਰੱਦ ਕਰੋ"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "1"
-
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr ""
-
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr ""
-
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr ""
-
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr ""
-
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr "ਕੀ ਤੁਸੀਂ ਸਾਰੇ ਪਰੋਗਰਾਮ ਬੰਦ ਕਰਕੇ ਕੰਪਿਊਟਰ ਨੂੰ ਮੁੜ-ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr "ਕੀ ਤੁਸੀਂ ਸਭ ਪਰੋਗਰਾਮ ਬੰਦ ਕਰਕੇ ਕੰਪਿਊਟਰ ਨੂੰ ਬੰਦ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr ""
+#~ msgid "Lock Screen"
+#~ msgstr "ਸਕਰੀਨ ਲਾਕ ਕਰੋ"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "ਲਾਗ ਆਉਟ"
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "ਮੁੜ-ਚਾਲੂ"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "ਸਸਪੈਂਡ"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "ਬੰਦ ਕਰੋ"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "ਹਾਈਬਰਨੇਟ"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "ਲਾਗ ਆਉਟ"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "ਮਹਿਮਾਨ ਸ਼ੈਸ਼ਨ"
-
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr ""
-
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "ਮੁੜ-ਚਾਲੂ"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "ਬੰਦ ਕਰੋ"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr ""
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "ਲਾਗ ਆਉਟ"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr ""
+#~ msgid "Restart Instead"
+#~ msgstr "ਇਸ ਦੀ ਬਜਾਏ ਮੁੜ-ਚਾਲੂ"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr ""
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "1"
 
 #~ msgid "Restart..."
 #~ msgstr "ਮੁੜ-ਚਾਲੂ"
@@ -297,14 +260,14 @@ msgstr ""
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
 #~ msgstr "ਇੰਝ ਬਣਾਇਆ ਹੈ ਤਾਂ ਕਿ ਲਾਗਆਉਟ ਬਟਨ ਸ਼ੈਸ਼ਨ ਮੇਨੂ 'ਚ ਵੇਖਾਈ ਨਾ ਦੇਵੇ।"
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "ਇੰਝ ਬਣਾਇਆ ਗਿਆ ਹੈ ਤਾਂ ਕਿ ਮੁੜ-ਚਾਲੂ ਬਟਨ ਸ਼ੈਸ਼ਨ ਮੇਨੂ 'ਚ ਵੇਖਾਈ ਨਾ ਦੇਵੇ।"
 
 #~ msgid ""
 #~ "Makes it so that the shutdown button doesn't show in the session menu."
 #~ msgstr "ਇੰਝ ਬਣਾਇਆ ਗਿਆ ਹੈ ਤਾਂ ਕਿ ਬੰਦ ਕਰੋ ਬਟਨ ਸ਼ੈਸ਼ਨ ਮੇਨੂ 'ਚ ਵੇਖਾਈ ਨਾ ਦੇਵੇ।"
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "%s ਤੋਂ ਸਵਿੱਚ ਕਰੋ..."
 
@@ -312,9 +275,6 @@ msgstr ""
 #~ msgid "Shut Down..."
 #~ msgstr "ਬੰਦ ਕਰੋ..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr "ਕੁਝ ਸਾਫਟਵੇਅਰ ਅੱਪਡੇਟ ਕੰਪਿਊਟਰ ਦੇ ਮੁੜ-ਚਾਲੂ ਹੋਣ ਤੱਕ ਅੱਪਡੇਟ ਨਹੀਂ ਹੋਣਗੇ।"
-
 #~ msgid "Restart Instead..."
 #~ msgstr "ਇਸ ਦੀ ਬਜਾਏ ਮੁੜ-ਚਾਲੂ..."
 
diff --git a/po/pl.po b/po/pl.po
index 569c300..6fe5629 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2011-09-26 14:52+0000\n"
 "Last-Translator: Dawid Dubanosow <Unknown>\n"
 "Language-Team: Polish\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,281 +19,316 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
 msgstr ""
-"Sprawia, że polecenie wylogowywania użytkownika nie jest wyświetlane w menu "
-"sesji."
+"Pomija wyświetlanie okna dialogowego, wymagającego potwierdzenia czynności "
+"wylogowania użytkownika, ponownego uruchomienia i wyłączenia komputera."
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-"Sprawia, że polecenie ponownego uruchomienia komputera nie jest wyświetlane "
-"w menu sesji."
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
-"Sprawia, że polecenie wyłączania komputera nie jest wyświetlane w menu sesji."
+"Przełącza wyświetlanie okna dialogowego, wymagającego potwierdzenia "
+"czynności wylogowania użytkownika, ponownego uruchomienia i wyłączenia "
+"komputera."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Usuwa  polecenie Wyloguj z menu sesji"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+"Sprawia, że polecenie wylogowywania użytkownika nie jest wyświetlane w menu "
+"sesji."
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Usuwa polecenie Uruchom ponownie z menu sesji"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
+"Sprawia, że polecenie ponownego uruchomienia komputera nie jest wyświetlane "
+"w menu sesji."
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
 msgid "Remove the shutdown item from the session menu"
 msgstr "Usuwa polecenie Wyłącz z menu sesji"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
-"Pomija wyświetlanie okna dialogowego, wymagającego potwierdzenia czynności "
-"wylogowania użytkownika, ponownego uruchomienia i wyłączenia komputera."
+"Sprawia, że polecenie wyłączania komputera nie jest wyświetlane w menu sesji."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"Przełącza wyświetlanie okna dialogowego, wymagającego potwierdzenia "
-"czynności wylogowania użytkownika, ponownego uruchomienia i wyłączenia "
-"komputera."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "Klasyczna sesja gościa"
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "Rozpoczyna sesję dla gościa z klasycznym pulpitem"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "Gość"
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Zablokuj ekran"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Wyłącz komputer"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Wyloguj użytkownika"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Uruchom komputer ponownie"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "Ustawienia systemu..."
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Wyloguj..."
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "Konta sieciowe..."
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Uruchom ponownie..."
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Wyłącz..."
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "Przełącz konto użytkownika..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "Wylogowywanie"
+#: ../src/service.c:575 ../src/service.c:591
+#, fuzzy
+msgid "Switch Account"
+msgstr "Przełącz konto użytkownika..."
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "Ponowne uruchamianie komputera"
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "Przełącz konto użytkownika..."
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
-msgstr "Wyłączanie komputera"
+#: ../src/service.c:588
+#, fuzzy
+msgid "Lock/Switch Account"
+msgstr "Przełącz konto użytkownika..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/service.c:594
+msgid "Lock"
 msgstr ""
-"Zakończyć działanie wszystkich programów i wylogować bieżącego użytkownika?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
-msgstr ""
-"Zakończyć działanie wszystkich programów i ponownie uruchomić komputer?"
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Sesja gościa"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
-msgstr "Zakończyć działanie wszystkich programów i wyłączyć komputer?"
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Wyloguj..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Wyloguj użytkownika"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Uruchom komputer ponownie"
-
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Wyłącz komputer"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Wstrzymaj"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Wyloguj użytkownika"
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Zahibernuj"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
+#: ../src/service.c:722
 msgid "Restart…"
 msgstr "Uruchom ponownie..."
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "Uruchom komputer ponownie"
+
+#: ../src/service.c:729
 msgid "Shut Down…"
 msgstr "Wyłącz..."
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Uruchom ponownie zamiast wylogować"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr "Wyłącz komputer"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "Uruchom ponownie mimo to..."
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
+msgstr ""
+"Zakończyć działanie wszystkich programów i wylogować bieżącego użytkownika?"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
 msgstr ""
 "Część oprogramowania zostanie zaktualizowana po ponownym uruchomieniu "
 "komputera."
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "używamy standardowy ciąg"
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr ""
+"Zakończyć działanie wszystkich programów i ponownie uruchomić komputer?"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr "Przełącz konto użytkownika..."
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr "Zakończyć działanie wszystkich programów i wyłączyć komputer?"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "Przełącz użytkownika %s…"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "Oprogramowanie jest aktualne"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "Dostępne aktualizacje..."
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "Instalowanie aktualizacji..."
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr "Uruchom ponownie i zaktualizuj..."
+#~ msgid "Classic Guest Session"
+#~ msgstr "Klasyczna sesja gościa"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "Ustawienia systemu..."
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "Rozpoczyna sesję dla gościa z klasycznym pulpitem"
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "Ekrany..."
+#~ msgid "Lock Screen"
+#~ msgstr "Zablokuj ekran"
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "Programy startowe..."
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Wylogowywanie"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "Podłączone urządzenia"
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Ponowne uruchamianie komputera"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "Drukarki"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Wyłączanie komputera"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "Skanery"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Wyloguj użytkownika"
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "Kamera internetowa"
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Uruchom komputer ponownie"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Wstrzymaj"
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Wyłącz komputer"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Zahibernuj"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Wyloguj użytkownika"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Sesja gościa"
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "Uruchom ponownie..."
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "Gość"
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "Wyłącz..."
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "Konta sieciowe..."
+#~ msgid "Restart Instead"
+#~ msgstr "Uruchom ponownie zamiast wylogować"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "Konta użytkowników..."
+#~ msgid "Restart Instead…"
+#~ msgstr "Uruchom ponownie mimo to..."
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "Kamera internetowa %s"
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr ""
+#~ "Część oprogramowania zostanie zaktualizowana po ponownym uruchomieniu "
+#~ "komputera."
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "Skaner"
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "używamy standardowy ciąg"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "Skaner %s"
+#~ msgid "Switch From %s…"
+#~ msgstr "Przełącz użytkownika %s…"
+
+#~ msgid "Software Up to Date"
+#~ msgstr "Oprogramowanie jest aktualne"
+
+#~ msgid "Updates Available…"
+#~ msgstr "Dostępne aktualizacje..."
+
+#~ msgid "Updates Installing…"
+#~ msgstr "Instalowanie aktualizacji..."
+
+#~ msgid "Restart to Complete Updates…"
+#~ msgstr "Uruchom ponownie i zaktualizuj..."
+
+#~ msgid "Displays…"
+#~ msgstr "Ekrany..."
+
+#~ msgid "Startup Applications…"
+#~ msgstr "Programy startowe..."
+
+#~ msgid "Attached Devices"
+#~ msgstr "Podłączone urządzenia"
+
+#~ msgid "Printers"
+#~ msgstr "Drukarki"
+
+#~ msgid "Scanners"
+#~ msgstr "Skanery"
+
+#~ msgid "Webcam"
+#~ msgstr "Kamera internetowa"
+
+#~ msgid "User Accounts…"
+#~ msgstr "Konta użytkowników..."
+
+#~ msgid "%s Webcam"
+#~ msgstr "Kamera internetowa %s"
+
+#~ msgid "Scanner"
+#~ msgstr "Skaner"
+
+#~ msgid "%s Scanner"
+#~ msgstr "Skaner %s"
 
 #~ msgid "Restart..."
 #~ msgstr "Uruchom ponownie..."
@@ -310,7 +346,6 @@ msgstr "Skaner %s"
 #~ msgid "Restart Instead..."
 #~ msgstr "Uruchom ponownie zamiast wylogowania..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Przełącz z: %s..."
 
@@ -320,7 +355,8 @@ msgstr "Skaner %s"
 #~ msgid "Restart to Complete Update…"
 #~ msgstr "Uruchom ponownie i zaktualizuj..."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "Nie wyświetla polecenia ponownego uruchamiania w menu sesji."
 
 #~ msgid ""
@@ -337,10 +373,5 @@ msgstr "Skaner %s"
 #~ msgid "Shut Down..."
 #~ msgstr "Wyłącz..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Część oprogramowania zostanie zaktualizowana po ponownym uruchomieniu "
-#~ "komputera."
-
 #~ msgid "Restart to Complete Update"
 #~ msgstr "Uruchom ponownie i zaktualizuj..."
diff --git a/po/ps.po b/po/ps.po
new file mode 100644
index 0000000..172ed6e
--- /dev/null
+++ b/po/ps.po
@@ -0,0 +1,204 @@
+# Pashto translations for PACKAGE package.
+# Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
+"PO-Revision-Date: 2017-07-21 15:41+0200\n"
+"Last-Translator: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n"
+"Language-Team: Pashto\n"
+"Language: ps\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
+msgid ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
+msgid "Remove the Log Out item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
+msgid "Remove the Restart item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
+msgid "Remove the shutdown item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr ""
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
+msgstr ""
+
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
+
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
+
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
+
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
+
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
+
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
+
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
+
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
+
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
+
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
+
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
+
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
+msgstr ""
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr ""
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr ""
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
+msgid "Log Out"
+msgstr ""
+
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr ""
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr ""
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr ""
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr ""
+
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr ""
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:818
+msgid "Are you sure you want to close all programs and log out?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:819
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
diff --git a/po/pt.po b/po/pt.po
index 5333d2f..ebed498 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2011-09-15 09:58+0000\n"
 "Last-Translator: Sérgio Bessa <sbessa@dcc.online.pt>\n"
 "Language-Team: Portuguese\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,274 +19,238 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
 msgstr ""
+"Suprimir a caixa de diálogo para confirmar acções de terminar sessão, "
+"reiniciar e encerrar"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
+"Mostrar ou não a caixa de diálogo para confirmar acções de terminar sessão, "
+"reiniciar e encerrar."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Remover o item \"Terminar Sessão\" do menu de sessão"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Remover a opção \"Reiniciar\" do menu de sessão"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
-msgstr "Remover a opção \"Encerrar\" do menu de sessão"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
-msgstr ""
-"Suprimir a caixa de diálogo para confirmar acções de terminar sessão, "
-"reiniciar e encerrar"
+msgid "Remove the shutdown item from the session menu"
+msgstr "Remover a opção \"Encerrar\" do menu de sessão"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
-"Mostrar ou não a caixa de diálogo para confirmar acções de terminar sessão, "
-"reiniciar e encerrar."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Bloquear Ecrã"
-
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Encerrar"
-
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Terminar Sessão"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Reiniciar"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Terminar Sessão..."
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Reiniciar..."
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Encerrar..."
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "Terminar Sessão"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "Reiniciar"
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
-msgstr "Encerrar"
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
 msgstr ""
-"Tem a certeza que deseja fechar todos os programas e terminar a sessão?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
 msgstr ""
-"Tem a certeza que deseja fechar todos os programas e reiniciar o computador?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
 msgstr ""
-"Tem a certeza que deseja fechar todos os programas e encerrar o computador?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "Terminar Sessão"
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Reiniciar"
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Sessão de Convidado"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Encerrar"
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Terminar Sessão..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Terminar Sessão"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Suspender"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Hibernar"
+
+#: ../src/service.c:722
 msgid "Restart…"
-msgstr ""
+msgstr "Reiniciar..."
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "Reiniciar"
+
+#: ../src/service.c:729
 msgid "Shut Down…"
-msgstr ""
+msgstr "Encerrar..."
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Reiniciar Agora"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr "Encerrar"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr ""
+"Tem a certeza que deseja fechar todos os programas e terminar a sessão?"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr "Algumas actualizações não serão aplicadas até reiniciar o computador."
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "0"
-
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr ""
-
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr ""
-
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr ""
-
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr ""
-
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr ""
-
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr ""
-
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
+"Tem a certeza que deseja fechar todos os programas e reiniciar o computador?"
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
+"Tem a certeza que deseja fechar todos os programas e encerrar o computador?"
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr ""
+#~ msgid "Lock Screen"
+#~ msgstr "Bloquear Ecrã"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Suspender"
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Terminar Sessão"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Hibernar"
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Reiniciar"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Sessão de Convidado"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Encerrar"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Terminar Sessão"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Reiniciar"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Encerrar"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr ""
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Terminar Sessão"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr ""
+#~ msgid "Restart Instead"
+#~ msgstr "Reiniciar Agora"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr ""
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "0"
 
 #~ msgid "Restart..."
 #~ msgstr "Reiniciar..."
@@ -303,7 +268,6 @@ msgstr ""
 #~ msgid "Restart Instead..."
 #~ msgstr "Reiniciar Agora..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Mudar de %s..."
 
@@ -321,17 +285,14 @@ msgstr ""
 #~ msgstr ""
 #~ "Faz com que o botão para terminar sessão não apareça no menu de sessão."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "Faz com que o botão de reiniciar não apareça no menu de sessão."
 
 #~ msgid ""
 #~ "Makes it so that the shutdown button doesn't show in the session menu."
 #~ msgstr "Faz com que o botão de encerrar não apareça no menu de sessão."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Algumas actualizações não serão aplicadas até reiniciar o computador."
-
 #~ msgid "Restart to Complete Update…"
 #~ msgstr "Reiniciar para Concluir a Actualização..."
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index d17aeff..4263cd0 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2011-09-15 10:44+0000\n"
 "Last-Translator: Tiago Hillebrandt <tiagoscd@yahoo.com.br>\n"
 "Language-Team: Brazilian Portuguese\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,279 +19,314 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr "Faz com que o botão sair não seja mostrado no menu sessão."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+"Não pedir confirmação ao encerrar a sessão, reiniciar ou desligar o "
+"computador."
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr "Faz com que o botão de reiniciar não seja mostrado no menu sessão."
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
-msgstr "Faz com que o botão de desligar não seja mostrado no menu sessão."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+"Mostrar ou não as janelas de confirmação para as ações de encerrar sessão, "
+"reiniciar ou desligar."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Remover o item Encerrar sessão do menu de sessão"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr "Faz com que o botão sair não seja mostrado no menu sessão."
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Remover o item Reiniciar do menu de sessão"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr "Faz com que o botão de reiniciar não seja mostrado no menu sessão."
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
 msgid "Remove the shutdown item from the session menu"
 msgstr "Remover o item Desligar do menu de sessão"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr "Faz com que o botão de desligar não seja mostrado no menu sessão."
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"Não pedir confirmação ao encerrar a sessão, reiniciar ou desligar o "
-"computador."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
-"Mostrar ou não as janelas de confirmação para as ações de encerrar sessão, "
-"reiniciar ou desligar."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "Sessão clássica de convidado"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "Convidado"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "Inicie uma sessão de convidado usando o desktop clássico"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Bloquear tela"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Desligar"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Encerrar sessão"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "Configurações do sistema..."
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Reiniciar"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "Contas on-line..."
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Encerrar sessão..."
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Reiniciar..."
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "Alternar conta de usuário..."
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Desligar..."
+#: ../src/service.c:575 ../src/service.c:591
+#, fuzzy
+msgid "Switch Account"
+msgstr "Alternar conta de usuário..."
+
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "Alternar conta de usuário..."
+
+#: ../src/service.c:588
+#, fuzzy
+msgid "Lock/Switch Account"
+msgstr "Alternar conta de usuário..."
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Sessão convidado"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Encerrar sessão..."
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Encerrar sessão"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Suspender"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Hibernar"
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr "Reiniciar..."
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
 msgid "Restart"
 msgstr "Reiniciar"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr "Desligar..."
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
 msgstr "Desligar"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr ""
 "Você tem certeza de que deseja fechar todos os programas e encerrar esta "
 "sessão?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+"Algumas atualizações de software não serão aplicadas até que o computador "
+"seja reiniciado."
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: ../src/backend-dbus/actions.c:862
 msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
 "Você tem certeza de que deseja fechar todos os programas e reiniciar o "
 "computador?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
 "Você tem certeza de que deseja fechar todos os programas e desligar o "
 "computador?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "Encerrar sessão"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Reiniciar"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Desligar"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Encerrar sessão"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr "Reiniciar..."
+#~ msgid "Classic Guest Session"
+#~ msgstr "Sessão clássica de convidado"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr "Desligar..."
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "Inicie uma sessão de convidado usando o desktop clássico"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Reiniciar ao invés de sair"
+#~ msgid "Lock Screen"
+#~ msgstr "Bloquear tela"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "Em vez disso, reiniciar..."
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Encerrar sessão"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
-"Algumas atualizações de software não serão aplicadas até a próxima "
-"reinicialização."
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Reiniciar"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "Cancelar"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Desligar"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "1"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Encerrar sessão"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr "Alternar conta de usuário..."
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Reiniciar"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "Alternar de %s..."
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Desligar"
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "Software atualizado"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Encerrar sessão"
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "Atualizações disponíveis..."
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "Reiniciar..."
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "Instalando atualizações..."
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "Desligar..."
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr "Reiniciar para completar a atualização..."
+#~ msgid "Restart Instead"
+#~ msgstr "Reiniciar ao invés de sair"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "Configurações do sistema..."
+#~ msgid "Restart Instead…"
+#~ msgstr "Em vez disso, reiniciar..."
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "Monitores..."
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr ""
+#~ "Algumas atualizações de software não serão aplicadas até a próxima "
+#~ "reinicialização."
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "Aplicativos de sessão..."
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "1"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "Dispositivos conectados"
+#~ msgid "Switch From %s…"
+#~ msgstr "Alternar de %s..."
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "Impressoras"
+#~ msgid "Software Up to Date"
+#~ msgstr "Software atualizado"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "Digitalizadores"
+#~ msgid "Updates Available…"
+#~ msgstr "Atualizações disponíveis..."
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "Webcam"
+#~ msgid "Updates Installing…"
+#~ msgstr "Instalando atualizações..."
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Suspender"
+#~ msgid "Restart to Complete Updates…"
+#~ msgstr "Reiniciar para completar a atualização..."
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Hibernar"
+#~ msgid "Displays…"
+#~ msgstr "Monitores..."
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Sessão convidado"
+#~ msgid "Startup Applications…"
+#~ msgstr "Aplicativos de sessão..."
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "Convidado"
+#~ msgid "Attached Devices"
+#~ msgstr "Dispositivos conectados"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "Contas on-line..."
+#~ msgid "Printers"
+#~ msgstr "Impressoras"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "Contas de usuário..."
+#~ msgid "Scanners"
+#~ msgstr "Digitalizadores"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "%s Webcam"
+#~ msgid "Webcam"
+#~ msgstr "Webcam"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "Digitalizador"
+#~ msgid "User Accounts…"
+#~ msgstr "Contas de usuário..."
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "%s Digitalizador"
+#~ msgid "%s Webcam"
+#~ msgstr "%s Webcam"
+
+#~ msgid "Scanner"
+#~ msgstr "Digitalizador"
+
+#~ msgid "%s Scanner"
+#~ msgstr "%s Digitalizador"
 
 #~ msgid "Restart..."
 #~ msgstr "Reiniciar..."
@@ -304,11 +340,6 @@ msgstr "%s Digitalizador"
 #~ msgid "Shut Down..."
 #~ msgstr "Desligar..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Algumas atualizações de software não serão aplicadas até que o computador "
-#~ "seja reiniciado."
-
 #~ msgctxt "button auth"
 #~ msgid "Restart..."
 #~ msgstr "Reiniciar..."
@@ -316,7 +347,6 @@ msgstr "%s Digitalizador"
 #~ msgid "Restart Instead..."
 #~ msgstr "Reiniciar ao invés de sair..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Alternar de %s..."
 
@@ -324,7 +354,8 @@ msgstr "%s Digitalizador"
 #~ msgid "Shut Down..."
 #~ msgstr "Desligar..."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "Faz com que o botão reiniciar não seja mostrado no menu de sessão."
 
 #~ msgid ""
diff --git a/po/ro.po b/po/ro.po
index 8b6d9c1..18637e7 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2011-09-15 09:58+0000\n"
 "Last-Translator: Alex Eftimie <alexeftimie@gmail.com>\n"
 "Language-Team: Romanian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,276 +19,241 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
 msgstr ""
+"Suprimă dialogul de confirmare pentru acțiunile de ieșire, repornire și "
+"oprire"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
+"Specifică dacă să fie afișat un dialog pentru acțiunile de ieșire, repornire "
+"și oprire."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Elimină elementul „Ieșire” din meniul de sesiune"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Elimină elementul „Repornire” din meniul de sesiune"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
-msgstr "Elimină elementul „Oprire” din meniul de sesiune"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
-msgstr ""
-"Suprimă dialogul de confirmare pentru acțiunile de ieșire, repornire și "
-"oprire"
+msgid "Remove the shutdown item from the session menu"
+msgstr "Elimină elementul „Oprire” din meniul de sesiune"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
-"Specifică dacă să fie afișat un dialog pentru acțiunile de ieșire, repornire "
-"și oprire."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Blocare ecran"
-
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Oprire"
-
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Ieșire"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Repornire"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Ieșire..."
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Repornire…"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Oprire…"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "Ieșire din cont"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "Repornire"
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
-msgstr "Oprire"
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
-msgstr "Sigur doriți să închideți toate programele și să ieșiți din cont?"
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
 msgstr ""
-"Sigur doriți să închideți toate aplicațiile și să reporniți calculatorul?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
 msgstr ""
-"Sigur doriți să închideți toate programele și să opriți calculatorul?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "Ieșire"
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Repornire"
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Sesiune oaspete"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Oprire"
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Ieșire..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Ieșire"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Suspendare"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Hibernare"
+
+#: ../src/service.c:722
 msgid "Restart…"
-msgstr ""
+msgstr "Repornire…"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "Repornire"
+
+#: ../src/service.c:729
 msgid "Shut Down…"
-msgstr ""
+msgstr "Oprire…"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Repornește"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr "Oprire"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
+msgstr "Sigur doriți să închideți toate programele și să ieșiți din cont?"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
 msgstr ""
+"Unele actualizări nu se vor aplica până la următoarea repornire a "
+"calculatorului."
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
 msgid "Cancel"
 msgstr "Renunță"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr ""
-"LG: aici 1 trebuie tradus ca ceva diferit de „1”. Dacă șirul e diferit de "
-"„1” în română se afișează un alt șir altundeva. Nu corectați decât dacă "
-"înțelegeți despre ce e vorba."
-
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr ""
-
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr ""
-
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr ""
-
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr ""
-
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr ""
-
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr ""
-
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
+"Sigur doriți să închideți toate aplicațiile și să reporniți calculatorul?"
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr "Sigur doriți să închideți toate programele și să opriți calculatorul?"
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr ""
+#~ msgid "Lock Screen"
+#~ msgstr "Blocare ecran"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Suspendare"
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Ieșire din cont"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Hibernare"
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Repornire"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Sesiune oaspete"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Oprire"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Ieșire"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Repornire"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Oprire"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr ""
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Ieșire"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr ""
+#~ msgid "Restart Instead"
+#~ msgstr "Repornește"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr ""
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr ""
+#~ "LG: aici 1 trebuie tradus ca ceva diferit de „1”. Dacă șirul e diferit de "
+#~ "„1” în română se afișează un alt șir altundeva. Nu corectați decât dacă "
+#~ "înțelegeți despre ce e vorba."
 
 #~ msgid "Restart..."
 #~ msgstr "Repornire..."
@@ -305,19 +271,15 @@ msgstr ""
 #~ msgid "Restart..."
 #~ msgstr "Repornire..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Unele actualizări nu se vor aplica până la următoarea repornire a "
-#~ "calculatorului."
-
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Schimbare de la %s..."
 
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
-#~ msgstr "Face ca butonul de ieșire să nu mai fie afișat în meniul de sesiune."
+#~ msgstr ""
+#~ "Face ca butonul de ieșire să nu mai fie afișat în meniul de sesiune."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr ""
 #~ "Face ca butonul de repornire să nu mai fie afișat în meniul de sesiune."
 
diff --git a/po/ru.po b/po/ru.po
index 0bb880c..bbf6b19 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2011-09-17 14:38+0000\n"
 "Last-Translator: Eugene Marshal <Unknown>\n"
 "Language-Team: Russian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,274 +19,308 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr "Позволяет скрыть кнопку завершения сеанса в меню сеанса."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+"Не показывать диалог подтверждения выхода, перезапуска и завершения работы"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr "Позволяет скрыть кнопку перезагрузки в меню сеанса."
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
-msgstr "Позволяет скрыть кнопку выключения компьютера в меню сеанса."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+"Показывать или нет диалоги подтверждения выхода из системы, перезапуска и "
+"завершения работы."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Убрать из меню пункт «Завершить сеанс»"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr "Позволяет скрыть кнопку завершения сеанса в меню сеанса."
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Убрать из меню пункт «Перезагрузить»"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr "Позволяет скрыть кнопку перезагрузки в меню сеанса."
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
 msgid "Remove the shutdown item from the session menu"
 msgstr "Убрать из меню пункт «Выключить»"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr "Позволяет скрыть кнопку выключения компьютера в меню сеанса."
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"Не показывать диалог подтверждения выхода, перезапуска и завершения работы"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
-"Показывать или нет диалоги подтверждения выхода из системы, перезапуска и "
-"завершения работы."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "Классический гостевой сеанс"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "Гость"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "Запустить гостевой сеанс с классической рабочей средой"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Заблокировать экран"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Выключить"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Завершить сеанс"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "Параметры системы..."
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Перезагрузить"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "Сетевые учётные записи..."
+
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
+
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "Переключить пользователя..."
+
+#: ../src/service.c:575 ../src/service.c:591
+#, fuzzy
+msgid "Switch Account"
+msgstr "Переключить пользователя..."
+
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "Переключить пользователя..."
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
+#: ../src/service.c:588
+#, fuzzy
+msgid "Lock/Switch Account"
+msgstr "Переключить пользователя..."
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Гостевой сеанс"
+
+#: ../src/service.c:696
 msgid "Log Out…"
 msgstr "Завершить сеанс..."
 
-#: ../src/settings-helper.c:89
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
+msgid "Log Out"
+msgstr "Завершить сеанс"
+
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Ждущий режим"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Спящий режим"
+
+#: ../src/service.c:722
 msgid "Restart…"
 msgstr "Перезагрузить..."
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "Перезагрузить"
+
+#: ../src/service.c:729
 msgid "Shut Down…"
 msgstr "Выключить..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "Завершение сеанса"
-
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "Перезагрузка"
-
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
-msgstr "Выключение"
+msgstr "Выключить"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr ""
 "Вы действительно хотите закрыть все приложения и завершить текущий сеанс?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+"Некоторые обновления будут установлены только после перезагрузки компьютера."
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "Отмена"
+
+#: ../src/backend-dbus/actions.c:862
 msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
 "Вы действительно хотите закрыть все приложения и перезагрузить компьютер?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr "Вы действительно хотите закрыть все приложения и выключить компьютер?"
+
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1008
 msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
-"Вы действительно хотите закрыть все приложения и выключить компьютер?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "Завершить сеанс"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Перезагрузить"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Выключить"
+#~ msgid "Classic Guest Session"
+#~ msgstr "Классический гостевой сеанс"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Завершить сеанс"
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "Запустить гостевой сеанс с классической рабочей средой"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr "Перезагрузка..."
+#~ msgid "Lock Screen"
+#~ msgstr "Заблокировать экран"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr "Выключить..."
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Завершение сеанса"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Перезагрузить"
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Перезагрузка"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "Выполнить перезагрузку..."
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Выключение"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
-"Некоторые обновления программ будут применены после перезагрузки компьютера."
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Завершить сеанс"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "Отмена"
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Перезагрузить"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "0"
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Выключить"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr "Переключить пользователя..."
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Завершить сеанс"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "Сменить с %s..."
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "Перезагрузка..."
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "Нет обновлений программ"
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "Выключить..."
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "Доступны обновления..."
+#~ msgid "Restart Instead"
+#~ msgstr "Перезагрузить"
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "Установка обновлений..."
+#~ msgid "Restart Instead…"
+#~ msgstr "Выполнить перезагрузку..."
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr "Перезагрузите компьютер для завершения обновления..."
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr ""
+#~ "Некоторые обновления программ будут применены после перезагрузки "
+#~ "компьютера."
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "Параметры системы..."
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "0"
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "Настройка экранов…"
+#~ msgid "Switch From %s…"
+#~ msgstr "Сменить с %s..."
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "Автозапуск программ..."
+#~ msgid "Software Up to Date"
+#~ msgstr "Нет обновлений программ"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "Подключённые устройства"
+#~ msgid "Updates Available…"
+#~ msgstr "Доступны обновления..."
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "Принтеры"
+#~ msgid "Updates Installing…"
+#~ msgstr "Установка обновлений..."
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "Сканеры"
+#~ msgid "Restart to Complete Updates…"
+#~ msgstr "Перезагрузите компьютер для завершения обновления..."
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "Веб-камера"
+#~ msgid "Displays…"
+#~ msgstr "Настройка экранов…"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Ждущий режим"
+#~ msgid "Startup Applications…"
+#~ msgstr "Автозапуск программ..."
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Спящий режим"
+#~ msgid "Attached Devices"
+#~ msgstr "Подключённые устройства"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Гостевой сеанс"
+#~ msgid "Printers"
+#~ msgstr "Принтеры"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "Гость"
+#~ msgid "Scanners"
+#~ msgstr "Сканеры"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "Сетевые учётные записи..."
+#~ msgid "Webcam"
+#~ msgstr "Веб-камера"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "Пользователи..."
+#~ msgid "User Accounts…"
+#~ msgstr "Пользователи..."
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "%s веб-камера"
+#~ msgid "%s Webcam"
+#~ msgstr "%s веб-камера"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "Сканер"
+#~ msgid "Scanner"
+#~ msgstr "Сканер"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "%s сканер"
+#~ msgid "%s Scanner"
+#~ msgstr "%s сканер"
 
 #~ msgid "Restart..."
 #~ msgstr "Перезагрузить..."
@@ -303,14 +338,9 @@ msgstr "%s сканер"
 #~ msgid "Restart Instead..."
 #~ msgstr "Перезагрузить..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Некоторые обновления будут установлены только после перезагрузки компьютера."
-
 #~ msgid "Switch User..."
 #~ msgstr "Смена пользователя..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Смена %s..."
 
@@ -327,7 +357,8 @@ msgstr "%s сканер"
 #~ msgid "Restart to Complete Update"
 #~ msgstr "Для завершения обновления требуется перезагрузка"
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "Скрыть в меню кнопку «Перезагрузить»."
 
 #~ msgid "Session"
diff --git a/po/sa.po b/po/sa.po
new file mode 100644
index 0000000..a94f131
--- /dev/null
+++ b/po/sa.po
@@ -0,0 +1,204 @@
+# Sanskrit translations for PACKAGE package.
+# Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
+"PO-Revision-Date: 2017-07-21 15:41+0200\n"
+"Last-Translator: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n"
+"Language-Team: Sanskrit\n"
+"Language: sa\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
+msgid ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
+msgid "Remove the Log Out item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
+msgid "Remove the Restart item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
+msgid "Remove the shutdown item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr ""
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
+msgstr ""
+
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
+
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
+
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
+
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
+
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
+
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
+
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
+
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
+
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
+
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
+
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
+
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
+msgstr ""
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr ""
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr ""
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
+msgid "Log Out"
+msgstr ""
+
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr ""
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr ""
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr ""
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr ""
+
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr ""
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:818
+msgid "Are you sure you want to close all programs and log out?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:819
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
diff --git a/po/sc.po b/po/sc.po
index 2c274ea..539fe76 100644
--- a/po/sc.po
+++ b/po/sc.po
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2010-04-08 18:13+0000\n"
 "Last-Translator: Dàriu Piga <Unknown>\n"
 "Language-Team: Sardinian <sc@li.org>\n"
+"Language: sc\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,277 +19,243 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
 msgstr ""
+"Boga sa ventana de cunfirmatzione pro sas atziones de acabu de sessione, "
+"recumentzu e  istudada."
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
+"Mustrare o nono sas ventanas de cunfirmatzione pro acabu de sessione, "
+"recumentzu e  istudada."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Boga su sèberu Serrare Sessione dae su menù de sessione"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgid "Remove the shutdown item from the session menu"
 msgstr ""
-"Boga sa ventana de cunfirmatzione pro sas atziones de acabu de sessione, "
-"recumentzu e  istudada."
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
-"Mustrare o nono sas ventanas de cunfirmatzione pro acabu de sessione, "
-"recumentzu e  istudada."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Serra a crae su bisore"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Istuda"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Serra sa sessione"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Torra a cumentzare"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
+#: ../src/service.c:361
+msgid "System Settings…"
 msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
+#: ../src/service.c:363
+msgid "Online Accounts…"
 msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
+#: ../src/service.c:566
+msgid "Start Screen Saver"
 msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "Serra sa sessione"
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "Torra a cumentzare"
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
-msgstr "Istuda"
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
 msgstr ""
-"Seguru/a ses chi cheres serrare totus sos programmas e serrare sa sessione "
-"de sa computadora?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
+#: ../src/service.c:594
+msgid "Lock"
 msgstr ""
-"Seguru/a ses chi cheres serrare totus sos programas e torrare a cumentzare "
-"sa sessione de sa computadora?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Sessione de Istràngiu"
+
+#: ../src/service.c:696
+msgid "Log Out…"
 msgstr ""
-"Seguru/a ses chi cheres serrare totus sos programas e istudare sa "
-"computadora?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Serra sa sessione"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Torra a cumentzare"
-
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Istuda"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Suspende"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Serra sa sessione"
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Iberra"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
+#: ../src/service.c:722
 msgid "Restart…"
 msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "Torra a cumentzare"
+
+#: ../src/service.c:729
 msgid "Shut Down…"
 msgstr ""
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Est menzus a torrare a cumentzare"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr "Istuda"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr ""
+"Seguru/a ses chi cheres serrare totus sos programmas e serrare sa sessione "
+"de sa computadora?"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
 msgstr ""
+"Unas cantas atualizatziones de software no si podent aplicare si no si "
+"torrat a cumentzare sa computadora"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
 msgid "Cancel"
 msgstr "Iscapa"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "No b'at memòria"
-
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr ""
-
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr ""
-
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr ""
-
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr ""
-
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr ""
-
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
+"Seguru/a ses chi cheres serrare totus sos programas e torrare a cumentzare "
+"sa sessione de sa computadora?"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
+"Seguru/a ses chi cheres serrare totus sos programas e istudare sa "
+"computadora?"
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr ""
+#~ msgid "Lock Screen"
+#~ msgstr "Serra a crae su bisore"
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Serra sa sessione"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Suspende"
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Torra a cumentzare"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Iberra"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Istuda"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Sessione de Istràngiu"
-
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Serra sa sessione"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Torra a cumentzare"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Istuda"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr ""
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Serra sa sessione"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr ""
+#~ msgid "Restart Instead"
+#~ msgstr "Est menzus a torrare a cumentzare"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr ""
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "No b'at memòria"
 
 #~ msgid "Log Out..."
 #~ msgstr "Serrare sa sessione..."
@@ -299,8 +266,8 @@ msgstr ""
 
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
 #~ msgstr ""
-#~ "Faghet chi su butone pro serrare sa sessione no siet mustradu in su menù de "
-#~ "sa sessione"
+#~ "Faghet chi su butone pro serrare sa sessione no siet mustradu in su menù "
+#~ "de sa sessione"
 
 #~ msgid "Shut Down..."
 #~ msgstr "Istuda..."
@@ -311,11 +278,6 @@ msgstr ""
 #~ msgid "Switch User..."
 #~ msgstr "Muda de impitadore..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Unas cantas atualizatziones de software no si podent aplicare si no si "
-#~ "torrat a cumentzare sa computadora"
-
 #~ msgid "Restart Instead..."
 #~ msgstr "Est menzus a torrare a cumentzare..."
 
@@ -323,6 +285,5 @@ msgstr ""
 #~ msgid "Restart..."
 #~ msgstr "Torra a cumentzare..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Muda dae %s..."
diff --git a/po/sd.po b/po/sd.po
index b218be4..74f7fbe 100644
--- a/po/sd.po
+++ b/po/sd.po
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2010-06-01 15:44+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Sindhi <sd@li.org>\n"
+"Language: sd\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,271 +19,235 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr ""
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr "خارج ٿيڻ، ٻيهر شروعات ۽ بند ٿيڻ لاءِ پڪ ڪرڻ وارو پڇاڻو ختم ڪيو"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
+"خارج ٿيڻ، ٻيهر شروعات ۽ بند ٿيڻ جي عملن لاءِ پڪ پڇڻ وارو پڇاڻو ڏيکارجي يا نه."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "سيشن فهرست مان خارج بٽن هٽايو"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
-msgstr "خارج ٿيڻ، ٻيهر شروعات ۽ بند ٿيڻ لاءِ پڪ ڪرڻ وارو پڇاڻو ختم ڪيو"
+msgid "Remove the shutdown item from the session menu"
+msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
-"خارج ٿيڻ، ٻيهر شروعات ۽ بند ٿيڻ جي عملن لاءِ پڪ پڇڻ وارو پڇاڻو ڏيکارجي يا نه."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "اسڪرين کي تالو"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "بند ڪريو"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "خارج ٿيو"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "ٻيهر شروع"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
+#: ../src/service.c:361
+msgid "System Settings…"
 msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
+#: ../src/service.c:363
+msgid "Online Accounts…"
 msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
+#: ../src/service.c:566
+msgid "Start Screen Saver"
 msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "خارج ٿيو"
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "ٻيهر شروع"
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
-msgstr "بند  ڪريو"
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
 msgstr ""
-"توهان کي پڪ آهي ته توهان سڀ پروگرام بند ڪري ڪمپيوٽر مان خارج ٿيڻ گهرو ٿا؟"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
+#: ../src/service.c:594
+msgid "Lock"
 msgstr ""
-"توهان کي پڪ آهي ته توهان سڀ پروگرام بند ڪري ڪمپيوٽر کي ٻيهر شروع ڪرڻ گهرو ٿا؟"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "مهمان سيشن"
+
+#: ../src/service.c:696
+msgid "Log Out…"
 msgstr ""
-"توهان کي پڪ آهي ته توهان سڀ پروگرام بند ڪري ڪمپيوٽر کي بند ڪرڻ گهرو ٿا؟"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "خارج ٿيو"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "ٻيهر شروع"
-
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "بند ڪريو"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "روڪيو"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "خارج ٿيو"
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "سمهاريو"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
+#: ../src/service.c:722
 msgid "Restart…"
 msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "ٻيهر شروع"
+
+#: ../src/service.c:729
 msgid "Shut Down…"
 msgstr ""
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "بلڪ ٻيهر شروع"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr "بند ڪريو"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr ""
+"توهان کي پڪ آهي ته توهان سڀ پروگرام بند ڪري ڪمپيوٽر مان خارج ٿيڻ گهرو ٿا؟"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr "ڪجھ سافٽويئر تجديدون نه ٿينديون جيستائين ڪمپيوٽر ٻيهر شروع نٿو ٿئي."
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
 msgid "Cancel"
 msgstr "رد"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "2"
-
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr ""
-
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr ""
-
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr ""
-
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr ""
-
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
+"توهان کي پڪ آهي ته توهان سڀ پروگرام بند ڪري ڪمپيوٽر کي ٻيهر شروع ڪرڻ گهرو ٿا؟"
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
+"توهان کي پڪ آهي ته توهان سڀ پروگرام بند ڪري ڪمپيوٽر کي بند ڪرڻ گهرو ٿا؟"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr ""
+#~ msgid "Lock Screen"
+#~ msgstr "اسڪرين کي تالو"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "خارج ٿيو"
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "ٻيهر شروع"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "روڪيو"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "بند  ڪريو"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "سمهاريو"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "خارج ٿيو"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "مهمان سيشن"
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "ٻيهر شروع"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr ""
-
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr ""
-
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "بند ڪريو"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr ""
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "خارج ٿيو"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr ""
+#~ msgid "Restart Instead"
+#~ msgstr "بلڪ ٻيهر شروع"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr ""
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "2"
 
 #~ msgid "Restart..."
 #~ msgstr "ٻيهر شروع..."
@@ -310,9 +275,5 @@ msgstr ""
 #~ msgid "Shut Down..."
 #~ msgstr "بند ڪريو..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr "ڪجھ سافٽويئر تجديدون نه ٿينديون جيستائين ڪمپيوٽر ٻيهر شروع نٿو ٿئي."
-
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "%s مان بدليو..."
diff --git a/po/se.po b/po/se.po
new file mode 100644
index 0000000..9c30a47
--- /dev/null
+++ b/po/se.po
@@ -0,0 +1,204 @@
+# Northern Sami translations for PACKAGE package.
+# Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
+"PO-Revision-Date: 2017-07-21 15:41+0200\n"
+"Last-Translator: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n"
+"Language-Team: Northern Sami\n"
+"Language: se\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
+msgid ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
+msgid "Remove the Log Out item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
+msgid "Remove the Restart item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
+msgid "Remove the shutdown item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr ""
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
+msgstr ""
+
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
+
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
+
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
+
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
+
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
+
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
+
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
+
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
+
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
+
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
+
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
+
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
+msgstr ""
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr ""
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr ""
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
+msgid "Log Out"
+msgstr ""
+
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr ""
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr ""
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr ""
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr ""
+
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr ""
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:818
+msgid "Are you sure you want to close all programs and log out?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:819
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
diff --git a/po/shn.po b/po/shn.po
new file mode 100644
index 0000000..59e27c7
--- /dev/null
+++ b/po/shn.po
@@ -0,0 +1,204 @@
+# Shan translations for PACKAGE package.
+# Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
+"PO-Revision-Date: 2017-07-21 15:41+0200\n"
+"Last-Translator: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n"
+"Language-Team: Shan\n"
+"Language: shn\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
+msgid ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
+msgid "Remove the Log Out item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
+msgid "Remove the Restart item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
+msgid "Remove the shutdown item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr ""
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
+msgstr ""
+
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
+
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
+
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
+
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
+
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
+
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
+
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
+
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
+
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
+
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
+
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
+
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
+msgstr ""
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr ""
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr ""
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
+msgid "Log Out"
+msgstr ""
+
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr ""
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr ""
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr ""
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr ""
+
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr ""
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:818
+msgid "Are you sure you want to close all programs and log out?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:819
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
diff --git a/po/si.po b/po/si.po
index 80e63d9..8c2a142 100644
--- a/po/si.po
+++ b/po/si.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2011-09-16 12:01+0000\n"
 "Last-Translator: පසිඳු කාවින්ද <Unknown>\n"
 "Language-Team: Sinhalese <si@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,20 +19,23 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr ""
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr "ඉවත් වීම, නැවත ඇරඹීම හා වසා දැමීම යන ක්‍රියාවන් සඳහා තහවුරු කරගැනීමේ පණිවුඩ වළක්වන්න"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgid ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
+"ඉවත් වීම, නැවත ඇරඹීම හා වසා දැමීම යන ක්‍රියාවන් සඳහා තහවුරු කරගැනීමේ පණිවුඩ පෙන්විය යුතුද හෝ "
+"නැතිද වග."
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
-msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+msgid "Remove the Log Out item from the session menu"
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
-msgid "Remove the Log Out item from the session menu"
+msgid "Makes it so that the logout button doesn’t show in the session menu."
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
@@ -39,250 +43,210 @@ msgid "Remove the Restart item from the session menu"
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgid "Remove the shutdown item from the session menu"
 msgstr ""
-"ඉවත් වීම, නැවත ඇරඹීම හා වසා දැමීම යන ක්‍රියාවන් සඳහා තහවුරු කරගැනීමේ පණිවුඩ "
-"වළක්වන්න"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
-"ඉවත් වීම, නැවත ඇරඹීම හා වසා දැමීම යන ක්‍රියාවන් සඳහා තහවුරු කරගැනීමේ පණිවුඩ "
-"පෙන්විය යුතුද හෝ නැතිද වග."
-
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "සම්භාව්‍ය අමුත්තාගේ සැසිය"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "තිරය අගුලු දමන්න"
-
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "වසා දමන්න"
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "පිටවෙන්න"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "යළි අරඹන්න"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "නික්මෙන්න…"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "යලි අරඹන්න…"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "වසා දමන්න…"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "ඉවත් වීම"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "යළි ඇරඹුම"
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
-msgstr "වසා දමන්න"
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
 msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
 msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
 msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "ඉවත් වන්න"
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "යළි අරඹන්න"
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "‘අමුත්තා‘ සැසිය"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "වසා දමන්න"
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "නික්මෙන්න…"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
-msgstr "නික්මෙන්න"
+msgstr "පිටවෙන්න"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "අත්හිටුවන්න"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "නිද්‍රාගත කරන්න"
+
+#: ../src/service.c:722
 msgid "Restart…"
-msgstr ""
+msgstr "යලි අරඹන්න…"
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "යළි අරඹන්න"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
+#: ../src/service.c:729
 msgid "Shut Down…"
-msgstr ""
+msgstr "වසා දමන්න…"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "යලි ඇරඹුම වෙනුවට"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr "වසා දමන්න"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
+#: ../src/backend-dbus/actions.c:818
+msgid "Are you sure you want to close all programs and log out?"
 msgstr ""
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
+#: ../src/backend-dbus/actions.c:819
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
 msgstr ""
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
 msgid "Cancel"
 msgstr "අවලංගු කරන්න"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "1"
-
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr ""
-
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr ""
-
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr ""
-
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr ""
+#~ msgid "Classic Guest Session"
+#~ msgstr "සම්භාව්‍ය අමුත්තාගේ සැසිය"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr ""
+#~ msgid "Lock Screen"
+#~ msgstr "තිරය අගුලු දමන්න"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "ඉවත් වීම"
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "යළි ඇරඹුම"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "අත්හිටුවන්න"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "වසා දමන්න"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "නිද්‍රාගත කරන්න"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "ඉවත් වන්න"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "‘අමුත්තා‘ සැසිය"
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "යළි අරඹන්න"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr ""
-
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr ""
-
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "වසා දමන්න"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr ""
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "නික්මෙන්න"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr ""
+#~ msgid "Restart Instead"
+#~ msgstr "යලි ඇරඹුම වෙනුවට"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr ""
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "1"
 
 #~ msgid "Restart..."
 #~ msgstr "යළි අරඹන්න..."
@@ -296,7 +260,6 @@ msgstr ""
 #~ msgid "Log Out..."
 #~ msgstr "ඉවත් වන්න..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "%s හි සිට මාරුවන්න..."
 
diff --git a/po/sk.po b/po/sk.po
index 4b32a2f..53eaa70 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2011-09-24 20:06+0000\n"
 "Last-Translator: Pavol Klacansky <pavol@klacansky.com>\n"
 "Language-Team: Slovak\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,274 +19,308 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
 msgstr ""
-"Spraví to, že sa tlačidlo na odhlásenie nebude zobrazovať v ponuke relácie."
+"Zakázať dialógové okno pre potvrdenie odhlásenia, reštartovania a vypnutia"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-"Spraví to, že sa tlačidlo na reštartovanie nebude zobrazovať v ponuke "
-"relácie."
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
-"Spraví to, že sa tlačidlo na vypnutie nebude zobrazovať v ponuke relácie."
+"Zobraziť alebo nezobraziť potvrdzujúce dialógové okno pri odhlásení, "
+"reštartovaní a vypínaní."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Odstrániť položku Odhlásiť sa z ponuky relácie."
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+"Spraví to, že sa tlačidlo na odhlásenie nebude zobrazovať v ponuke relácie."
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Odstrániť položku Reštartovať z ponuky relácie."
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
+"Spraví to, že sa tlačidlo na reštartovanie nebude zobrazovať v ponuke "
+"relácie."
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
 msgid "Remove the shutdown item from the session menu"
 msgstr "Odstrániť položku Vypnúť z ponuky relácie."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
-"Zakázať dialógové okno pre potvrdenie odhlásenia, reštartovania a vypnutia"
+"Spraví to, že sa tlačidlo na vypnutie nebude zobrazovať v ponuke relácie."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"Zobraziť alebo nezobraziť potvrdzujúce dialógové okno pri odhlásení, "
-"reštartovaní a vypínaní."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "Klasická hosťovská relácia"
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "Spustiť hosťovskú reláciu s klasickým prostredím"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "Hosť"
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Uzamknúť obrazovku"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Vypnúť"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Odhlásiť sa"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Reštartovať"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "Nastavenia systému..."
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Odhlásiť sa..."
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "Online účty..."
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Reštartovať..."
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Vypnúť..."
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "Prepnúť používateľský účet..."
+
+#: ../src/service.c:575 ../src/service.c:591
+#, fuzzy
+msgid "Switch Account"
+msgstr "Prepnúť používateľský účet..."
+
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "Prepnúť používateľský účet..."
+
+#: ../src/service.c:588
+#, fuzzy
+msgid "Lock/Switch Account"
+msgstr "Prepnúť používateľský účet..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Relácia pre hosťa"
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Odhlásiť sa..."
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Odhlásiť sa"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Uspať"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Hibernovať"
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr "Reštartovať..."
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
 msgid "Restart"
 msgstr "Reštartovať"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr "Vypnúť..."
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
 msgstr "Vypnúť"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr "Naozaj chcete zavrieť všetky programy a odhlásiť sa?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+"Niektoré aktualizácie nebudú aplikované pokiaľ sa počítač nereštartuje."
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "Zrušiť"
+
+#: ../src/backend-dbus/actions.c:862
 msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr "Naozaj chcete zavrieť všetky programy a reštartovať počítač?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr "Naozaj chcete zavrieť všetky programy a vypnúť počítač?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "Odhlásiť sa"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Reštartovať"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Vypnúť"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Odhlásiť sa"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr "Reštartovať…"
+#~ msgid "Classic Guest Session"
+#~ msgstr "Klasická hosťovská relácia"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr "Vypnúť…"
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "Spustiť hosťovskú reláciu s klasickým prostredím"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Miesto toho reštartovať"
+#~ msgid "Lock Screen"
+#~ msgstr "Uzamknúť obrazovku"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "Namiesto toho reštartovať…"
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Odhlásiť sa"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr "Niektoré aktualizácie softvéru sa aplikujú až po reštarte počítača."
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Reštartovať"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "Zrušiť"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Vypnúť"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "0"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Odhlásiť sa"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr "Prepnúť používateľský účet..."
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Reštartovať"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "Prepnúť z %s…"
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Vypnúť"
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "Softvér je aktuálny"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Odhlásiť sa"
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "Aktualizácie sú dostupné..."
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "Reštartovať…"
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "Inštalujú sa aktualizácie..."
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "Vypnúť…"
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr "Reštartujte pre dokončenie aktualizácií..."
+#~ msgid "Restart Instead"
+#~ msgstr "Miesto toho reštartovať"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "Nastavenia systému..."
+#~ msgid "Restart Instead…"
+#~ msgstr "Namiesto toho reštartovať…"
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "Monitory..."
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr "Niektoré aktualizácie softvéru sa aplikujú až po reštarte počítača."
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "Aplikácie spúšťané pri štarte…"
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "0"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "Pripojené zariadenia"
+#~ msgid "Switch From %s…"
+#~ msgstr "Prepnúť z %s…"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "Tlačiarne"
+#~ msgid "Software Up to Date"
+#~ msgstr "Softvér je aktuálny"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "Skenery"
+#~ msgid "Updates Available…"
+#~ msgstr "Aktualizácie sú dostupné..."
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "Webová kamera"
+#~ msgid "Updates Installing…"
+#~ msgstr "Inštalujú sa aktualizácie..."
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Uspať"
+#~ msgid "Restart to Complete Updates…"
+#~ msgstr "Reštartujte pre dokončenie aktualizácií..."
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Hibernovať"
+#~ msgid "Displays…"
+#~ msgstr "Monitory..."
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Relácia pre hosťa"
+#~ msgid "Startup Applications…"
+#~ msgstr "Aplikácie spúšťané pri štarte…"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "Hosť"
+#~ msgid "Attached Devices"
+#~ msgstr "Pripojené zariadenia"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "Online účty..."
+#~ msgid "Printers"
+#~ msgstr "Tlačiarne"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "Používateľské účty…"
+#~ msgid "Scanners"
+#~ msgstr "Skenery"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "Webová kamera %s"
+#~ msgid "Webcam"
+#~ msgstr "Webová kamera"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "Skener"
+#~ msgid "User Accounts…"
+#~ msgstr "Používateľské účty…"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "Skener %s"
+#~ msgid "%s Webcam"
+#~ msgstr "Webová kamera %s"
+
+#~ msgid "Scanner"
+#~ msgstr "Skener"
+
+#~ msgid "%s Scanner"
+#~ msgstr "Skener %s"
 
 #~ msgid "Restart..."
 #~ msgstr "Reštartovať..."
@@ -299,7 +334,6 @@ msgstr "Skener %s"
 #~ msgid "Switch User..."
 #~ msgstr "Prepnúť používateľa..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Prepnúť z %s..."
 
@@ -311,10 +345,6 @@ msgstr "Skener %s"
 #~ msgid "Restart..."
 #~ msgstr "Reštartovať..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Niektoré aktualizácie nebudú aplikované pokiaľ sa počítač nereštartuje."
-
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
 #~ msgstr "Úprava aby sa tlačidlo odhlásenia nezobrazovalo v ponuke relácie."
 
@@ -325,7 +355,8 @@ msgstr "Skener %s"
 #~ msgid "Restart Instead..."
 #~ msgstr "Miesto toho reštartovať..."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "Úprava aby sa tlačidlo reštart nezobrazovalo v ponuke relácie."
 
 #~ msgid "Restart to Complete Update…"
diff --git a/po/sl.po b/po/sl.po
index 533af5a..8750c3a 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2011-09-15 14:28+0000\n"
 "Last-Translator: Andrej Znidarsic <andrej.znidarsic@gmail.com>\n"
 "Language-Team: Slovenian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,277 +19,312 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr "Določi, da gumb odjava ni prikazan v meniju seje."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+"Ne prikaži pogovornih oken za potrditev odjave, ponovnega zagona in izklopa "
+"sistema"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr "Določi, da gumb ponovni zagon ni prikazan v meniju seje."
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
-msgstr "Določi, da gumb izklop ni prikazan v meniju seje."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+"Vklop in izklop prikaza pogovornih oken za potrditev odjave, ponovnega "
+"zagona in izklopa."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Odstrani gumb za odjavo iz menija seje"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr "Določi, da gumb odjava ni prikazan v meniju seje."
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Odstrani gumb za ponovni zagon iz menija seje"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr "Določi, da gumb ponovni zagon ni prikazan v meniju seje."
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
 msgid "Remove the shutdown item from the session menu"
 msgstr "Odstrani gumb za izklop iz menija seje"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr "Določi, da gumb izklop ni prikazan v meniju seje."
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"Ne prikaži pogovornih oken za potrditev odjave, ponovnega zagona in izklopa "
-"sistema"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
-"Vklop in izklop prikaza pogovornih oken za potrditev odjave, ponovnega "
-"zagona in izklopa."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "Klasična seja gosta"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "Gost"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "Zažene sejo gosta s klasičnim namizjem"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Zaklep zaslona"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Izklop"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Odjava"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "Sistemske nastavitve ..."
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Ponovni zagon"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "Spletni računi ..."
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Odjava ..."
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Ponovni zagon ..."
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "Preklopi uporabniški račun ..."
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Izklop ..."
+#: ../src/service.c:575 ../src/service.c:591
+#, fuzzy
+msgid "Switch Account"
+msgstr "Preklopi uporabniški račun ..."
+
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "Preklopi uporabniški račun ..."
+
+#: ../src/service.c:588
+#, fuzzy
+msgid "Lock/Switch Account"
+msgstr "Preklopi uporabniški račun ..."
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Seja gosta"
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Odjava ..."
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Odjava"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "V pripravljenost"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "V mirovanje"
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr "Ponovni zagon ..."
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
 msgid "Restart"
 msgstr "Ponovni zagon"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr "Izklop ..."
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
 msgstr "Izklop"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr ""
 "Ali ste prepričani, da želite zapreti vse programe in se odjaviti iz sistema?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+"Nekatere posodobitve programske opreme ne bodo uveljavljene do ponovnega "
+"zagona računalnika."
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "Prekliči"
+
+#: ../src/backend-dbus/actions.c:862
 msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
 "Ali ste prepričani, da želite zapreti vse programe in ponovno zagnati "
 "računalnik?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
 "Ali ste prepričani, da želite zapreti vse programe in izklopiti računalnik?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "Odjava"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Ponovno zaženi"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Izklopi"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Odjavi se"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr "Ponoven zagon ..."
+#~ msgid "Classic Guest Session"
+#~ msgstr "Klasična seja gosta"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr "Izklop ..."
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "Zažene sejo gosta s klasičnim namizjem"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Ponovno zaženi"
+#~ msgid "Lock Screen"
+#~ msgstr "Zaklep zaslona"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "Ponovno zaženi ..."
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Odjava"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
-"Nekatere posodobitve programov ne bodo uveljavljene dokler računalnika "
-"ponovno ne zaženete."
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Ponovni zagon"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "Prekliči"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Izklop"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "1"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Odjava"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr "Preklopi uporabniški račun ..."
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Ponovno zaženi"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "Preklopi iz %s ..."
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Izklopi"
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "Programi so posodobljeni"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Odjavi se"
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "Na voljo so posodobitve ..."
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "Ponoven zagon ..."
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "Posodobitve se nameščajo ..."
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "Izklop ..."
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr "Ponoven zagon za dokončanje posodobitev ..."
+#~ msgid "Restart Instead"
+#~ msgstr "Ponovno zaženi"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "Sistemske nastavitve ..."
+#~ msgid "Restart Instead…"
+#~ msgstr "Ponovno zaženi ..."
+
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr ""
+#~ "Nekatere posodobitve programov ne bodo uveljavljene dokler računalnika "
+#~ "ponovno ne zaženete."
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "Zasloni ..."
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "1"
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "Začetni programi ..."
+#~ msgid "Switch From %s…"
+#~ msgstr "Preklopi iz %s ..."
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "Priključene naprave"
+#~ msgid "Software Up to Date"
+#~ msgstr "Programi so posodobljeni"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "Tiskalniki"
+#~ msgid "Updates Available…"
+#~ msgstr "Na voljo so posodobitve ..."
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "Optični bralniki"
+#~ msgid "Updates Installing…"
+#~ msgstr "Posodobitve se nameščajo ..."
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "Spletna kamera"
+#~ msgid "Restart to Complete Updates…"
+#~ msgstr "Ponoven zagon za dokončanje posodobitev ..."
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "V pripravljenost"
+#~ msgid "Displays…"
+#~ msgstr "Zasloni ..."
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "V mirovanje"
+#~ msgid "Startup Applications…"
+#~ msgstr "Začetni programi ..."
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Seja gosta"
+#~ msgid "Attached Devices"
+#~ msgstr "Priključene naprave"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "Gost"
+#~ msgid "Printers"
+#~ msgstr "Tiskalniki"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "Spletni računi ..."
+#~ msgid "Scanners"
+#~ msgstr "Optični bralniki"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "Uporabniški računi ..."
+#~ msgid "Webcam"
+#~ msgstr "Spletna kamera"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "Spletna kamera %s"
+#~ msgid "User Accounts…"
+#~ msgstr "Uporabniški računi ..."
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "Optični bralnik"
+#~ msgid "%s Webcam"
+#~ msgstr "Spletna kamera %s"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "Optični bralnik %s"
+#~ msgid "Scanner"
+#~ msgstr "Optični bralnik"
+
+#~ msgid "%s Scanner"
+#~ msgstr "Optični bralnik %s"
 
 #~ msgid "Switch User..."
 #~ msgstr "Preklop uporabnika ..."
@@ -308,11 +344,6 @@ msgstr "Optični bralnik %s"
 #~ msgid "Log Out..."
 #~ msgstr "Odjava ..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Nekatere posodobitve programske opreme ne bodo uveljavljene do ponovnega "
-#~ "zagona računalnika."
-
 #~ msgid "Restart to Complete Update…"
 #~ msgstr "Ponovno zaženite za dokončanje posodobitve ..."
 
@@ -325,14 +356,14 @@ msgstr "Optični bralnik %s"
 #~ msgid "Shut Down..."
 #~ msgstr "Izklop ..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Preklop iz računa %s ..."
 
 #~ msgid "Session"
 #~ msgstr "Seja"
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "Gumba za ponovni zagon ne prikaže v meniju seje."
 
 #~ msgid "Restart..."
diff --git a/po/sq.po b/po/sq.po
index c349fbd..f93b6a1 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2011-09-15 14:02+0000\n"
 "Last-Translator: Vilson Gjeci <vilsongjeci@gmail.com>\n"
 "Language-Team: Albanian <sq@li.org>\n"
+"Language: sq\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,278 +19,313 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr "Bën që butoni i daljes të mos shfaqë menunë e seksionit."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+"Pezullo dialogun për të konfirmuar veprimet e daljes, rindezjes dhe fikjes"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr "Bën që butoni i rindezjes të mos shfaqet në menunë e seksionit."
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
-msgstr "Bën që butoni i fikjes të mos shfaqet në menunë e seksionit."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+"Nëse duhen shfaqur apo jo dialogjet e konfirmimit për veprimet e daljes, "
+"rindezjes dhe fikjes."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Hiqe temën e daljes nga menuja e seksionit"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr "Bën që butoni i daljes të mos shfaqë menunë e seksionit."
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Hiqe temën e rindezjes nga menuja e seksionit"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr "Bën që butoni i rindezjes të mos shfaqet në menunë e seksionit."
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
 msgid "Remove the shutdown item from the session menu"
 msgstr "Hiqe temën e fikjes nga menuja e seksionit"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr "Bën që butoni i fikjes të mos shfaqet në menunë e seksionit."
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"Pezullo dialogun për të konfirmuar veprimet e daljes, rindezjes dhe fikjes"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
-"Nëse duhen shfaqur apo jo dialogjet e konfirmimit për veprimet e daljes, "
-"rindezjes dhe fikjes."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "Seksion Klasik i të Ftuarit"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "Mysafir"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "Nisni një seksion të të ftuarit duke përdorur desktopin klasik"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Blloko Ekranin"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Fike"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Dalja"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "Parametrat e Sistemit..."
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Rindiz"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "Llogaritë Online..."
+
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
+
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "Ndërro Llogarinë e Përdoruesit..."
+
+#: ../src/service.c:575 ../src/service.c:591
+#, fuzzy
+msgid "Switch Account"
+msgstr "Ndërro Llogarinë e Përdoruesit..."
+
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "Ndërro Llogarinë e Përdoruesit..."
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
+#: ../src/service.c:588
+#, fuzzy
+msgid "Lock/Switch Account"
+msgstr "Ndërro Llogarinë e Përdoruesit..."
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Seksion si i Ftuar"
+
+#: ../src/service.c:696
 msgid "Log Out…"
 msgstr "Dil..."
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Rindiz..."
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
+msgid "Log Out"
+msgstr "Dalja"
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Fike..."
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Pezullo"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "Dil"
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Hiberno"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr "Rindiz..."
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
 msgid "Restart"
 msgstr "Rindiz"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr "Fike..."
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
 msgstr "Fike"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr ""
 "Jeni i sigurtë që dëshironi t'i mbyllni të gjitha programet dhe do të dilni "
 "nga kompjuteri?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+"Disa nga përditësimet nuk do të aplikohen deri në rindezjen tjetër të "
+"kompjuterit."
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "Anullo"
+
+#: ../src/backend-dbus/actions.c:862
 msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
 "Jeni i sigurtë që dëshironi t'i mbyllni të gjitha programet dhe do të "
 "rindizni kompjuterin?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
 "Jeni i sigurtë që dëshironi t'i mbyllni të gjitha programet dhe do të fikni "
 "kompjuterin?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "Dil"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Rindiz"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Fike"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Dil"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr "Rindize..."
+#~ msgid "Classic Guest Session"
+#~ msgstr "Seksion Klasik i të Ftuarit"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr "Fike..."
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "Nisni një seksion të të ftuarit duke përdorur desktopin klasik"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Rindize në Vend të Kësaj"
+#~ msgid "Lock Screen"
+#~ msgstr "Blloko Ekranin"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "Rindize në Vend të Kësaj..."
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Dil"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
-"Disa përditësime të programeve nuk do të aplikohen deri sa kompjuteri të "
-"rindizet."
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Rindiz"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "Anullo"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Fike"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "1"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Dil"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr "Ndërro Llogarinë e Përdoruesit..."
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Rindiz"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "Ndërro Nga %s..."
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Fike"
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "Programet Janë të Përditësuara"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Dil"
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "Përditësime të Disponueshme..."
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "Rindize..."
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "Përditësimet po Instalohen..."
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "Fike..."
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr "Rindize për të kompletuar përditësimet..."
+#~ msgid "Restart Instead"
+#~ msgstr "Rindize në Vend të Kësaj"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "Parametrat e Sistemit..."
+#~ msgid "Restart Instead…"
+#~ msgstr "Rindize në Vend të Kësaj..."
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "Ekranet..."
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr ""
+#~ "Disa përditësime të programeve nuk do të aplikohen deri sa kompjuteri të "
+#~ "rindizet."
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "Programet në Nisje..."
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "1"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "Pajisjet e Bashkangjitura"
+#~ msgid "Switch From %s…"
+#~ msgstr "Ndërro Nga %s..."
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "Printerat"
+#~ msgid "Software Up to Date"
+#~ msgstr "Programet Janë të Përditësuara"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "Skanerat"
+#~ msgid "Updates Available…"
+#~ msgstr "Përditësime të Disponueshme..."
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "Webcam"
+#~ msgid "Updates Installing…"
+#~ msgstr "Përditësimet po Instalohen..."
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Pezullo"
+#~ msgid "Restart to Complete Updates…"
+#~ msgstr "Rindize për të kompletuar përditësimet..."
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Hiberno"
+#~ msgid "Displays…"
+#~ msgstr "Ekranet..."
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Seksion si i Ftuar"
+#~ msgid "Startup Applications…"
+#~ msgstr "Programet në Nisje..."
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "Mysafir"
+#~ msgid "Attached Devices"
+#~ msgstr "Pajisjet e Bashkangjitura"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "Llogaritë Online..."
+#~ msgid "Printers"
+#~ msgstr "Printerat"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "Llogaritë e Përdoruesit..."
+#~ msgid "Scanners"
+#~ msgstr "Skanerat"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "%s Webcam"
+#~ msgid "Webcam"
+#~ msgstr "Webcam"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "Skaner"
+#~ msgid "User Accounts…"
+#~ msgstr "Llogaritë e Përdoruesit..."
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "%s Skaner"
+#~ msgid "%s Webcam"
+#~ msgstr "%s Webcam"
+
+#~ msgid "Scanner"
+#~ msgstr "Skaner"
+
+#~ msgid "%s Scanner"
+#~ msgstr "%s Skaner"
 
 #~ msgid "Restart..."
 #~ msgstr "Rindiz..."
@@ -310,12 +346,6 @@ msgstr "%s Skaner"
 #~ msgid "Restart Instead..."
 #~ msgstr "Rindize në Vend të Kësaj..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Disa nga përditësimet nuk do të aplikohen deri në rindezjen tjetër të "
-#~ "kompjuterit."
-
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Ndërro nga %s..."
 
@@ -326,7 +356,8 @@ msgstr "%s Skaner"
 #~ msgid "Shut Down..."
 #~ msgstr "Fike..."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "Bëj që butoni i rindezjes të mos shfaqet në menunë e seksionit."
 
 #~ msgid ""
diff --git a/po/sr.po b/po/sr.po
index aaaa00a..5e92e9c 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,296 +7,330 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2011-09-18 15:59+0000\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Ubuntu Serbian Translators\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2011-09-27 15:12+0000\n"
 "X-Generator: Launchpad (build 14041)\n"
-"Language: sr\n"
 
+# Ово је објашњење (а не наредба) које налазимо у гконф уреднику „gconf-editor: /+apps_indicator-session“
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr "Чини да се дугме за одјављивање не приказује у изборнику сесије."
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
 msgstr ""
-"Чини да се дугме за поновно покретање не приказује у изборнику сесије."
+"Спречава прозорче за потврђивање акције одјављивања, поновног покретања и "
+"гашења"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
+# Ово је објашњење (а не наредба) које налазимо у гконф уреднику „gconf-editor: /+apps_indicator-session“
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
-msgstr "Чини да се дугме за гашење не приказује у изборнику сесије."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+"Да ли ће бити приказано или не прозорче за потврђивање акције одјављивања, "
+"поновног покретања и гашења."
 
 # Ово је објашњење (а не наредба) које налазимо у гконф уреднику „gconf-editor: /+apps_indicator-session“
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Уклања ставку Одјављивања из менија сесије"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr "Чини да се дугме за одјављивање не приказује у изборнику сесије."
+
 # Ово је објашњење (а не наредба) које налазимо у гконф уреднику „gconf-editor: /+apps_indicator-session“
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Уклања ставку Поновног покретања из менија сесије"
 
-# Ово је објашњење (а не наредба) које налазимо у гконф уреднику „gconf-editor: /+apps_indicator-session“
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
-msgstr "Уклања ставку Гашења из менија сесије"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr "Чини да се дугме за поновно покретање не приказује у изборнику сесије."
 
 # Ово је објашњење (а не наредба) које налазимо у гконф уреднику „gconf-editor: /+apps_indicator-session“
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
-msgstr ""
-"Спречава прозорче за потврђивање акције одјављивања, поновног покретања и "
-"гашења"
+msgid "Remove the shutdown item from the session menu"
+msgstr "Уклања ставку Гашења из менија сесије"
 
-# Ово је објашњење (а не наредба) које налазимо у гконф уреднику „gconf-editor: /+apps_indicator-session“
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr "Чини да се дугме за гашење не приказује у изборнику сесије."
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"Да ли ће бити приказано или не прозорче за потврђивање акције одјављивања, "
-"поновног покретања и гашења."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "Класична сесија госта"
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "Покрените сесију госта користећи класичну радну површ"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "Гост"
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Закључај екран"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Угаси"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Одјављивање"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Поново покрени"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "Подешавања система..."
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Одјављивање..."
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "Налози на мрежи..."
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Рестартуј..."
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Угаси..."
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "Пребаци налог корисника..."
+
+#: ../src/service.c:575 ../src/service.c:591
+#, fuzzy
+msgid "Switch Account"
+msgstr "Пребаци налог корисника..."
+
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "Пребаци налог корисника..."
+
+#: ../src/service.c:588
+#, fuzzy
+msgid "Lock/Switch Account"
+msgstr "Пребаци налог корисника..."
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Сесија за госта"
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Одјављивање..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Одјављивање"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Обустави"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Замрзни"
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr "Рестартуј..."
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
 msgid "Restart"
 msgstr "Поново покрени"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr "Угаси..."
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
-msgstr "Гашење"
+msgstr "Угаси"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr ""
 "Да ли сте сигурни да желите да затворите све програме и да се одјавите са "
 "рачунара?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+"Нека ажурирања софтвера се неће применити све до следећег рестартовања "
+"рачунара."
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "Поништи"
+
+#: ../src/backend-dbus/actions.c:862
 msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
 "Да ли сте сигурни да желите да затворите све програме и да рестартујете "
 "рачунар?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
 "Да ли сте сигурни да желите да затворите све програме и да угасите рачунар?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "Одјављивање"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Поново покрени"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Угаси"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Одјави ме"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr "Поново покрени..."
+#~ msgid "Classic Guest Session"
+#~ msgstr "Класична сесија госта"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr "Угаси..."
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "Покрените сесију госта користећи класичну радну површ"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Рестартуј"
+#~ msgid "Lock Screen"
+#~ msgstr "Закључај екран"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "Ипак поново покрени..."
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Одјављивање"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
-"Нека ажурирања софтвера неће бити примењена све до следећег покретања "
-"рачунара."
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Поново покрени"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "Поништи"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Гашење"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "Покрени корисника..."
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Одјављивање"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr "Пребаци налог корисника..."
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Поново покрени"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "Пребаци са „%s“..."
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Угаси"
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "Софвер је ажуриран"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Одјави ме"
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "Доступна ажурирања..."
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "Поново покрени..."
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "Инсталација ажурирања..."
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "Угаси..."
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr "Поново покрени да довршиш ажурирања..."
+#~ msgid "Restart Instead"
+#~ msgstr "Рестартуј"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "Подешавања система..."
+#~ msgid "Restart Instead…"
+#~ msgstr "Ипак поново покрени..."
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "Екрани..."
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr ""
+#~ "Нека ажурирања софтвера неће бити примењена све до следећег покретања "
+#~ "рачунара."
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "Почетни програми..."
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "Покрени корисника..."
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "Прикључени уређаји"
+#~ msgid "Switch From %s…"
+#~ msgstr "Пребаци са „%s“..."
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "Штампачи"
+#~ msgid "Software Up to Date"
+#~ msgstr "Софвер је ажуриран"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "Скенери"
+#~ msgid "Updates Available…"
+#~ msgstr "Доступна ажурирања..."
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "Веб камерица"
+#~ msgid "Updates Installing…"
+#~ msgstr "Инсталација ажурирања..."
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Обустави"
+#~ msgid "Restart to Complete Updates…"
+#~ msgstr "Поново покрени да довршиш ажурирања..."
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Замрзни"
+#~ msgid "Displays…"
+#~ msgstr "Екрани..."
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Сесија за госта"
+#~ msgid "Startup Applications…"
+#~ msgstr "Почетни програми..."
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "Гост"
+#~ msgid "Attached Devices"
+#~ msgstr "Прикључени уређаји"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "Налози на мрежи..."
+#~ msgid "Printers"
+#~ msgstr "Штампачи"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "Кориснички налози..."
+#~ msgid "Scanners"
+#~ msgstr "Скенери"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "%s веб камерица"
+#~ msgid "Webcam"
+#~ msgstr "Веб камерица"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "Скенер"
+#~ msgid "User Accounts…"
+#~ msgstr "Кориснички налози..."
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "%s скенер"
+#~ msgid "%s Webcam"
+#~ msgstr "%s веб камерица"
+
+#~ msgid "Scanner"
+#~ msgstr "Скенер"
+
+#~ msgid "%s Scanner"
+#~ msgstr "%s скенер"
 
 #~ msgid "Switch User..."
 #~ msgstr "Промени корисника..."
@@ -314,11 +348,6 @@ msgstr "%s скенер"
 #~ msgid "Shut Down..."
 #~ msgstr "Гашење..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Нека ажурирања софтвера се неће применити све до следећег рестартовања "
-#~ "рачунара."
-
 #~ msgctxt "button auth"
 #~ msgid "Restart..."
 #~ msgstr "Рестартовање..."
@@ -326,7 +355,6 @@ msgstr "%s скенер"
 #~ msgid "Restart Instead..."
 #~ msgstr "Рестартуј..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Пребаци на %s..."
 
@@ -341,7 +369,8 @@ msgstr "%s скенер"
 #~ msgstr "Чини да се дугме за одјављивање не приказује у менију сесије."
 
 # Ово је објашњење (а не наредба) које налазимо у гконф уреднику „gconf-editor: /+apps_indicator-session“
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "Чини да се дугме за поновно покретање не приказује у менију сесије."
 
 # Ово је објашњење (а не наредба) које налазимо у гконф уреднику „gconf-editor: /+apps_indicator-session“
diff --git a/po/sv.po b/po/sv.po
index d2852a8..0551e2e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2011-09-17 09:33+0000\n"
 "Last-Translator: Daniel Nylander <yeager@ubuntu.com>\n"
 "Language-Team: Swedish\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,273 +19,302 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr "Gör så att utloggningsknappen inte visas i sessionsmenyn."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+"Visa inte dialogrutan för att bekräfta utloggning, omstart och avstängning"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr "Gör så att omstartsknappen inte visas i sessionsmenyn."
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
-msgstr "Gör så att avstängningsknappen inte visas i sessionsmenyn."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+"Bestäm om dialogruta för att bekräfta utloggning, omstart och avstängning "
+"ska visas ."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Ta bort Logga ut-objektet från sessionsmenyn"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr "Gör så att utloggningsknappen inte visas i sessionsmenyn."
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Ta bort objektet Starta om från sessionsmenyn"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr "Gör så att omstartsknappen inte visas i sessionsmenyn."
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
 msgid "Remove the shutdown item from the session menu"
 msgstr "Ta bort avstängningsobjektet från sessionsmenyn"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr "Gör så att avstängningsknappen inte visas i sessionsmenyn."
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"Visa inte dialogrutan för att bekräfta utloggning, omstart och avstängning"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
-"Bestäm om dialogruta för att bekräfta utloggning, omstart och avstängning "
-"ska visas ."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "Klassisk gästsession"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "Gäst"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "Starta en gästsession med det klassiska skrivbordet"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Lås skärmen"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Stäng av"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Logga ut"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "Systeminställningar..."
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Starta om"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "Nätkonton..."
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Logga ut..."
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Starta om..."
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "Växla användarkonto..."
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Stäng av..."
+#: ../src/service.c:575 ../src/service.c:591
+#, fuzzy
+msgid "Switch Account"
+msgstr "Växla användarkonto..."
+
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "Växla användarkonto..."
+
+#: ../src/service.c:588
+#, fuzzy
+msgid "Lock/Switch Account"
+msgstr "Växla användarkonto..."
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Gästsession"
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Logga ut..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Logga ut"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Vänteläge"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Viloläge"
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr "Starta om..."
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
 msgid "Restart"
 msgstr "Starta om"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr "Stäng av..."
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
 msgstr "Stäng av"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr ""
 "Är du säker på att du vill stänga alla program och logga ut från datorn?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+"Vissa programuppdateringar kommer inte att verkställas förrän datorn har "
+"startats om."
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: ../src/backend-dbus/actions.c:862
 msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr "Är du säker på att du vill stänga alla program och starta om datorn?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr "Är du säker på att du vill stänga alla program och stänga av datorn?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "Logga ut"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Starta om"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Stäng av"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Logga ut"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr "Starta om..."
+#~ msgid "Classic Guest Session"
+#~ msgstr "Klassisk gästsession"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr "Stäng av..."
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "Starta en gästsession med det klassiska skrivbordet"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Starta om istället"
+#~ msgid "Lock Screen"
+#~ msgstr "Lås skärmen"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "Starta om istället..."
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Logga ut"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
-"Några programuppdateringar kommer inte att tillämpas förrän datorn har "
-"startats om."
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Starta om"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "Avbryt"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Stäng av"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "1"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Logga ut"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr "Växla användarkonto..."
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Starta om"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "Växla från %s…"
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Stäng av"
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "Programmen är uppdaterade"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Logga ut"
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "Uppdateringar finns tillgängliga..."
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "Starta om..."
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "Uppdateringar installeras..."
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "Stäng av..."
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr "Starta om för att färdigställa uppdateringen..."
+#~ msgid "Restart Instead"
+#~ msgstr "Starta om istället"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "Systeminställningar..."
+#~ msgid "Restart Instead…"
+#~ msgstr "Starta om istället..."
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "Skärmar..."
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr ""
+#~ "Några programuppdateringar kommer inte att tillämpas förrän datorn har "
+#~ "startats om."
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "Uppstartsprogram..."
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "1"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "Anslutna enheter"
+#~ msgid "Switch From %s…"
+#~ msgstr "Växla från %s…"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "Skrivare"
+#~ msgid "Software Up to Date"
+#~ msgstr "Programmen är uppdaterade"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "Bildläsare"
+#~ msgid "Updates Available…"
+#~ msgstr "Uppdateringar finns tillgängliga..."
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "Webbkamera"
+#~ msgid "Updates Installing…"
+#~ msgstr "Uppdateringar installeras..."
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Vänteläge"
+#~ msgid "Restart to Complete Updates…"
+#~ msgstr "Starta om för att färdigställa uppdateringen..."
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Viloläge"
+#~ msgid "Displays…"
+#~ msgstr "Skärmar..."
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Gästsession"
+#~ msgid "Startup Applications…"
+#~ msgstr "Uppstartsprogram..."
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "Gäst"
+#~ msgid "Attached Devices"
+#~ msgstr "Anslutna enheter"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "Nätkonton..."
+#~ msgid "Printers"
+#~ msgstr "Skrivare"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "Användarkonton..."
+#~ msgid "Scanners"
+#~ msgstr "Bildläsare"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr ""
+#~ msgid "Webcam"
+#~ msgstr "Webbkamera"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "Bildläsare"
+#~ msgid "User Accounts…"
+#~ msgstr "Användarkonton..."
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr ""
+#~ msgid "Scanner"
+#~ msgstr "Bildläsare"
 
 #~ msgid "Restart..."
 #~ msgstr "Starta om..."
@@ -302,15 +332,9 @@ msgstr ""
 #~ msgid "Restart..."
 #~ msgstr "Starta om..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Vissa programuppdateringar kommer inte att verkställas förrän datorn har "
-#~ "startats om."
-
 #~ msgid "Restart Instead..."
 #~ msgstr "Starta om istället..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Växla från %s..."
 
@@ -321,7 +345,8 @@ msgstr ""
 #~ msgid "Shut Down..."
 #~ msgstr "Stäng av..."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "Gör så att omstartsknappen inte visas i sessionsmenyn."
 
 #~ msgid ""
diff --git a/po/sw.po b/po/sw.po
new file mode 100644
index 0000000..ff80bd1
--- /dev/null
+++ b/po/sw.po
@@ -0,0 +1,204 @@
+# Swahili translations for PACKAGE package.
+# Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
+"PO-Revision-Date: 2017-07-21 15:41+0200\n"
+"Last-Translator: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n"
+"Language-Team: Swahili\n"
+"Language: sw\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
+msgid ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
+msgid "Remove the Log Out item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
+msgid "Remove the Restart item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
+msgid "Remove the shutdown item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr ""
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
+msgstr ""
+
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
+
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
+
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
+
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
+
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
+
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
+
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
+
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
+
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
+
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
+
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
+
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
+msgstr ""
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr ""
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr ""
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
+msgid "Log Out"
+msgstr ""
+
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr ""
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr ""
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr ""
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr ""
+
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr ""
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:818
+msgid "Are you sure you want to close all programs and log out?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:819
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
diff --git a/po/szl.po b/po/szl.po
new file mode 100644
index 0000000..2c48398
--- /dev/null
+++ b/po/szl.po
@@ -0,0 +1,204 @@
+# Language szl translations for PACKAGE package.
+# Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
+"PO-Revision-Date: 2017-07-21 15:41+0200\n"
+"Last-Translator: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n"
+"Language-Team: Language szl\n"
+"Language: szl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
+msgid ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
+msgid "Remove the Log Out item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
+msgid "Remove the Restart item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
+msgid "Remove the shutdown item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr ""
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
+msgstr ""
+
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
+
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
+
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
+
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
+
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
+
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
+
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
+
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
+
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
+
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
+
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
+
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
+msgstr ""
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr ""
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr ""
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
+msgid "Log Out"
+msgstr ""
+
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr ""
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr ""
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr ""
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr ""
+
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr ""
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:818
+msgid "Are you sure you want to close all programs and log out?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:819
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
diff --git a/po/ta.po b/po/ta.po
index 4edaaee..e0a04ba 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2010-07-07 14:49+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Tamil <ta@li.org>\n"
+"Language: ta\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,20 +19,21 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgid ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
-msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+msgid "Remove the Log Out item from the session menu"
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
-msgid "Remove the Log Out item from the session menu"
+msgid "Makes it so that the logout button doesn’t show in the session menu."
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
@@ -39,249 +41,202 @@ msgid "Remove the Restart item from the session menu"
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgid "Remove the shutdown item from the session menu"
 msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "திரையைப் பூட்டுக."
-
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "பணி நிறுத்தம்"
-
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "வெளியேறு"
-
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "மறுதுவக்கம்"
-
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
+#: ../src/service.c:325
+msgid "Guest"
 msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
 msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
 msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "வெளியேறு"
-
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "மறுதுவக்கம்"
-
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
-msgstr "பணி நிறுத்தம்"
-
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/service.c:346
+msgid "About This Computer"
 msgstr ""
-"அனைத்து நிரல்களையும் மூடி உங்களது கணினியை விடுபதிகை செய்ய நீங்கள் உறுதியாக "
-"உள்ளீர்களா?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
+#: ../src/service.c:361
+msgid "System Settings…"
 msgstr ""
-"அனைத்து நிரல்களையும் மூடி கணினியை மீள்துவக்கம் செய்ய உறுதியாக உள்ளீர்களா?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/service.c:363
+msgid "Online Accounts…"
 msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "வெளியேறு"
-
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "மறுதுவக்கம்"
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "பணி நிறுத்தம்"
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "வெளியேறு"
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
 msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
 msgstr ""
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
+#: ../src/service.c:594
+msgid "Lock"
 msgstr ""
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
+#: ../src/service.c:619
+msgid "Guest Session"
 msgstr ""
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
+#: ../src/service.c:696
+msgid "Log Out…"
 msgstr ""
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "தவிர்க்க"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
+msgid "Log Out"
+msgstr "வெளியேறு"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr ""
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "இடைநிறுத்தம்"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr ""
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "உறங்கு"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
+#: ../src/service.c:722
+msgid "Restart…"
 msgstr ""
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr ""
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "மறுதுவக்கம்"
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
+#: ../src/service.c:729
+msgid "Shut Down…"
 msgstr ""
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr ""
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr "பணி நிறுத்தம்"
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr ""
+"அனைத்து நிரல்களையும் மூடி உங்களது கணினியை விடுபதிகை செய்ய நீங்கள் உறுதியாக உள்ளீர்களா?"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
+#: ../src/backend-dbus/actions.c:819
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
 msgstr ""
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "தவிர்க்க"
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr "அனைத்து நிரல்களையும் மூடி கணினியை மீள்துவக்கம் செய்ய உறுதியாக உள்ளீர்களா?"
+
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "இடைநிறுத்தம்"
+#~ msgid "Lock Screen"
+#~ msgstr "திரையைப் பூட்டுக."
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "உறங்கு"
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "வெளியேறு"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "மறுதுவக்கம்"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "பணி நிறுத்தம்"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "வெளியேறு"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "மறுதுவக்கம்"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr ""
-
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "பணி நிறுத்தம்"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr ""
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "வெளியேறு"
 
 #~ msgid "Shut Down..."
 #~ msgstr "நிறுத்தவும்..."
diff --git a/po/te.po b/po/te.po
index 6dac4c1..54bc7b1 100644
--- a/po/te.po
+++ b/po/te.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2011-09-14 03:03+0000\n"
 "Last-Translator: Praveen Illa <mail2ipn@gmail.com>\n"
 "Language-Team: Telugu <te@li.org>\n"
+"Language: te\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,276 +19,281 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr ""
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr "లాగౌట్, పునఃప్రారంభ మరియు మూసివేత చర్యలను రూఢీ చేయడానికి డైలాగును కనుమరుగు చేయి"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
-msgstr ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr "లాగౌట్, పునఃప్రారంభ మరియు మూసివేత  చర్యల కొరకు రూఢీ డైలాగులు చూయించాలా వద్దా"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "లాగ్ అవుట్ బొత్తం సెషన్ మెనూలో కనబడకుండా చేస్తుంది"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "తిరిగిప్రారంభించు బొత్తం సెషన్ మెనూనుండి తొలగించు"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
-msgstr "మూసివేయు బొత్తం సెషన్ మెనూనుండి తొలగించు"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
-msgstr ""
-"లాగౌట్, పునఃప్రారంభ మరియు మూసివేత చర్యలను రూఢీ చేయడానికి డైలాగును కనుమరుగు "
-"చేయి"
+msgid "Remove the shutdown item from the session menu"
+msgstr "మూసివేయు బొత్తం సెషన్ మెనూనుండి తొలగించు"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
-"లాగౌట్, పునఃప్రారంభ మరియు మూసివేత  చర్యల కొరకు రూఢీ డైలాగులు చూయించాలా వద్దా"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "స్క్రీన్ లాక్‌చేయుము"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "అతిథి"
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "మూసివేయి"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "లాగౌట్"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "పునఃప్రారంభించు"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "లాగౌట్"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "వ్యవస్థ అమరికలు..."
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "పునః ప్రారంభించు"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "ఆన్‌లైన్ ఖాతాలు..."
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "మూసి వేయి"
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "లాగౌట్"
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "వాడుకరి ఖాతా మార్చు..."
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "పునఃప్రారంభించు"
+#: ../src/service.c:575 ../src/service.c:591
+#, fuzzy
+msgid "Switch Account"
+msgstr "వాడుకరి ఖాతా మార్చు..."
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
-msgstr "మూసివేయి"
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "వాడుకరి ఖాతా మార్చు..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
-msgstr ""
-"మీరు ఖచ్ఛితంగా అన్ని ప్రోగ్రాంలను మూసివెయ్యాలనుకుంటున్నారా  మరియు కంప్యూటర్ "
-"లాగౌట్ చెయ్యమంటారా?"
+#: ../src/service.c:588
+#, fuzzy
+msgid "Lock/Switch Account"
+msgstr "వాడుకరి ఖాతా మార్చు..."
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
+#: ../src/service.c:594
+msgid "Lock"
 msgstr ""
-"మీరు ఖచ్ఛితంగా అన్ని ప్రోగ్రాంలను మూసివెయ్యాలనుకుంటున్నారా మరియు కంప్యూటర్ "
-"పునఃప్రారంభించమంటారా?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
-msgstr ""
-"మీరు ఖచ్ఛితంగా అన్ని ప్రోగ్రాంలను మూసివెయ్యాలనుకుంటున్నారా మరియు కంప్యూటర్ను "
-"కూడా మూసివెయ్యమంటారా?"
-
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "లాగౌట్ చేయి"
-
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "పునఃప్రారంభించు"
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "అతిథి సెషను"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "మూసివేయి"
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "లాగౌట్"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "లాగౌట్"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "అర్ధాంతరంగా నిలిపివేయు"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "సుప్తావస్థ"
+
+#: ../src/service.c:722
 msgid "Restart…"
+msgstr "పునః ప్రారంభించు"
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
 msgstr "పునఃప్రారంభించు"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
+#: ../src/service.c:729
 msgid "Shut Down…"
-msgstr "మూసివేయి"
+msgstr "మూసి వేయి"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "బదులుగా పునఃప్రారంభించు"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr "మూసివేయి"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "బదులుగా పునఃప్రారంభించు..."
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
+msgstr "మీరు ఖచ్ఛితంగా అన్ని ప్రోగ్రాంలను మూసివెయ్యాలనుకుంటున్నారా  మరియు కంప్యూటర్ లాగౌట్ చెయ్యమంటారా?"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr "కొ న్ని సాప్ట్వేర్ల నవీకరణలు కంప్యూటర్ పున:ప్రారంభం అయ్యే వరకూ అన్వయించబడవు."
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
 msgid "Cancel"
 msgstr "రద్దుచేయి"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "1"
-
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr "వాడుకరి ఖాతా మార్చు..."
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr ""
+"మీరు ఖచ్ఛితంగా అన్ని ప్రోగ్రాంలను మూసివెయ్యాలనుకుంటున్నారా మరియు కంప్యూటర్ పునఃప్రారంభించమంటారా?"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
+"మీరు ఖచ్ఛితంగా అన్ని ప్రోగ్రాంలను మూసివెయ్యాలనుకుంటున్నారా మరియు కంప్యూటర్ను కూడా మూసివెయ్యమంటారా?"
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "నవీకరణలు అందుబాటులోవున్నాయి..."
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "నవీకరణలను స్థాపిస్తున్నది..."
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "వ్యవస్థ అమరికలు..."
+#~ msgid "Lock Screen"
+#~ msgstr "స్క్రీన్ లాక్‌చేయుము"
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "లాగౌట్"
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "ప్రారంభ అనువర్తనాలు..."
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "పునఃప్రారంభించు"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "జతచేసిన పరికరాలు"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "మూసివేయి"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "ముద్రకాలు"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "లాగౌట్ చేయి"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "స్కానర్లు"
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "పునఃప్రారంభించు"
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "వెబ్‌క్యామ్"
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "మూసివేయి"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "అర్ధాంతరంగా నిలిపివేయు"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "లాగౌట్"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "సుప్తావస్థ"
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "పునఃప్రారంభించు"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "అతిథి సెషను"
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "మూసివేయి"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "అతిథి"
+#~ msgid "Restart Instead"
+#~ msgstr "బదులుగా పునఃప్రారంభించు"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "ఆన్‌లైన్ ఖాతాలు..."
+#~ msgid "Restart Instead…"
+#~ msgstr "బదులుగా పునఃప్రారంభించు..."
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "వాడుకరి ఖాతాలు..."
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "1"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "%s వెబ్‌క్యామ్"
+#~ msgid "Updates Available…"
+#~ msgstr "నవీకరణలు అందుబాటులోవున్నాయి..."
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "స్కానర్"
+#~ msgid "Updates Installing…"
+#~ msgstr "నవీకరణలను స్థాపిస్తున్నది..."
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "%s స్కానర్"
+#~ msgid "Startup Applications…"
+#~ msgstr "ప్రారంభ అనువర్తనాలు..."
+
+#~ msgid "Attached Devices"
+#~ msgstr "జతచేసిన పరికరాలు"
+
+#~ msgid "Printers"
+#~ msgstr "ముద్రకాలు"
+
+#~ msgid "Scanners"
+#~ msgstr "స్కానర్లు"
+
+#~ msgid "Webcam"
+#~ msgstr "వెబ్‌క్యామ్"
+
+#~ msgid "User Accounts…"
+#~ msgstr "వాడుకరి ఖాతాలు..."
+
+#~ msgid "%s Webcam"
+#~ msgstr "%s వెబ్‌క్యామ్"
+
+#~ msgid "Scanner"
+#~ msgstr "స్కానర్"
+
+#~ msgid "%s Scanner"
+#~ msgstr "%s స్కానర్"
 
 #~ msgid "Restart..."
 #~ msgstr "పునఃప్రారంభించు..."
@@ -305,10 +311,6 @@ msgstr "%s స్కానర్"
 #~ msgid "Shut Down..."
 #~ msgstr "మూసి వేయి..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "కొ న్ని సాప్ట్వేర్ల నవీకరణలు కంప్యూటర్ పున:ప్రారంభం అయ్యే వరకూ అన్వయించబడవు."
-
 #~ msgctxt "button auth"
 #~ msgid "Restart..."
 #~ msgstr "పునఃప్రారంభించు..."
@@ -325,14 +327,14 @@ msgstr "%s స్కానర్"
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
 #~ msgstr "సెషన్ మెనూలో నిష్క్రమణ బటన్ కనపడకుండా చేస్తుంది."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "%s నుండి వినియోగదారుని మార్చు..."
 
 #~ msgid "Session"
 #~ msgstr "సెషను"
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "తిరిగిప్రారంభించు బొత్తం సెషన్ మెనూలో కనబడకుండా చేస్తుంది"
 
 #~ msgid ""
diff --git a/po/tg.po b/po/tg.po
new file mode 100644
index 0000000..6dd9f1c
--- /dev/null
+++ b/po/tg.po
@@ -0,0 +1,204 @@
+# Tajik translations for PACKAGE package.
+# Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
+"PO-Revision-Date: 2017-07-21 15:41+0200\n"
+"Last-Translator: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n"
+"Language-Team: Tajik\n"
+"Language: tg\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
+msgid ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
+msgid "Remove the Log Out item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
+msgid "Remove the Restart item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
+msgid "Remove the shutdown item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr ""
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
+msgstr ""
+
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
+
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
+
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
+
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
+
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
+
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
+
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
+
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
+
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
+
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
+
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
+
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
+msgstr ""
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr ""
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr ""
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
+msgid "Log Out"
+msgstr ""
+
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr ""
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr ""
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr ""
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr ""
+
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr ""
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:818
+msgid "Are you sure you want to close all programs and log out?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:819
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
diff --git a/po/th.po b/po/th.po
index 2195e8e..3852b9a 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2011-09-18 07:43+0000\n"
 "Last-Translator: Manop Pornpeanvichanon(มานพ พรเพียรวิชานนท์) <Unknown>\n"
 "Language-Team: Thai\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,271 +19,300 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr "ไม่ต้องแสดงปุ่มออกจากระบบในเมนูวาระ"
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr "ไม่ต้องแสดงกล่องโต้ตอบยืนยันการออกจากระบบ เริ่มเปิดเครื่องใหม่ และปิดเครื่อง"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr "ไม่ต้องแสดงปุ่มเริ่มเครื่องใหม่ในเมนูวาระ"
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
-msgstr "ไม่ต้องแสดงปุ่มปิดเครื่องในเมนูวาระ"
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr "ให้แสดงหรือไม่แสดงกล่องโต้ตอบเพื่อยืนยันการออกจากระบบ เริ่มเปิดเครื่องใหม่ และปิดเครื่อง"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "ถอนรายการออกจากระบบออกจากเมนูวาระ"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr "ไม่ต้องแสดงปุ่มออกจากระบบในเมนูวาระ"
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "ถอนรายการเริ่มเปิดเครื่องใหม่ออกจากเมนูวาระ"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr "ไม่ต้องแสดงปุ่มเริ่มเครื่องใหม่ในเมนูวาระ"
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
 msgid "Remove the shutdown item from the session menu"
 msgstr "ถอนรายการปิดเครื่องออกจากเมนูวาระ"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr "ไม่ต้องแสดงปุ่มปิดเครื่องในเมนูวาระ"
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"ไม่ต้องแสดงกล่องโต้ตอบยืนยันการออกจากระบบ เริ่มเปิดเครื่องใหม่ และปิดเครื่อง"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
+
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "ผู้ใช้ชั่วคราว"
+
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
 msgstr ""
-"ให้แสดงหรือไม่แสดงกล่องโต้ตอบเพื่อยืนยันการออกจากระบบ เริ่มเปิดเครื่องใหม่ "
-"และปิดเครื่อง"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "วาระผู้ใช้ชั่วคราวแบบดั้งเดิม"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "เริ่มใช้พื้นโต๊ะแบบดั้งเดิมกับวาระผู้ใช้ชั่วคราว"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "ล็อคหน้าจอ"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "ตั้งค่าระบบ..."
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "ปิดเครื่อง"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "บัญชีออนไลน์..."
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "ออกจากระบบ"
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "เริ่มเปิดเครื่องใหม่"
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "สลับบัญชีผู้ใช้..."
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "ออกจากระบบ..."
+#: ../src/service.c:575 ../src/service.c:591
+#, fuzzy
+msgid "Switch Account"
+msgstr "สลับบัญชีผู้ใช้..."
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "เริ่มเปิดเครื่องใหม่..."
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "สลับบัญชีผู้ใช้..."
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "ปิดเครื่อง..."
+#: ../src/service.c:588
+#, fuzzy
+msgid "Lock/Switch Account"
+msgstr "สลับบัญชีผู้ใช้..."
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "วาระผู้ใช้ชั่วคราว"
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "ออกจากระบบ..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "ออกจากระบบ"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "พักเครื่อง"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "จำศีล"
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr "เริ่มเปิดเครื่องใหม่..."
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
 msgid "Restart"
 msgstr "เริ่มเปิดเครื่องใหม่"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr "ปิดเครื่อง..."
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
 msgstr "ปิดเครื่อง"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr "คุณแน่ใจหรือไม่ที่จะปิดโปรแกรมทั้งหมดและออกจากคอมพิวเตอร์?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr "การปรับปรุงซอฟต์แวร์ในบางครั้งจะปรับใช้หลังจากเริ่มคอมพิวเตอร์ใหม่"
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "ยกเลิก"
+
+#: ../src/backend-dbus/actions.c:862
 msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr "คุณแน่ใจหรือไม่ที่จะปิดโปรแกรมทั้งหมดและเริ่มเปิดเครื่องคอมพิวเตอร์ใหม่?"
+
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr "คุณแน่ใจหรือไม่ที่จะปิดโปรแกรมทั้งหมดและปิดเครื่องคอมพิวเตอร์?"
+
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
-"คุณแน่ใจหรือไม่ที่จะปิดโปรแกรมทั้งหมดและเริ่มเปิดเครื่องคอมพิวเตอร์ใหม่?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
+#: ../src/backend-dbus/actions.c:1008
 msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
-msgstr "คุณแน่ใจหรือไม่ที่จะปิดโปรแกรมทั้งหมดและปิดเครื่องคอมพิวเตอร์?"
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "ออกจากระบบ"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "เริ่มเปิดเครื่องใหม่"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "ปิดเครื่อง"
+#~ msgid "Classic Guest Session"
+#~ msgstr "วาระผู้ใช้ชั่วคราวแบบดั้งเดิม"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "ออกจากระบบ"
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "เริ่มใช้พื้นโต๊ะแบบดั้งเดิมกับวาระผู้ใช้ชั่วคราว"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr "เริ่มเปิดเครื่องใหม่..."
+#~ msgid "Lock Screen"
+#~ msgstr "ล็อคหน้าจอ"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr "ปิดเครื่อง..."
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "ออกจากระบบ"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "เปลี่ยนเป็นเริ่มเปิดเครื่องใหม่"
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "เริ่มเปิดเครื่องใหม่"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "เปลี่ยนเป็นเริ่มเปิดเครื่องใหม่…"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "ปิดเครื่อง"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr "การปรับข้อมูลในบางซอฟต์แวร์จะไม่มีผล จนกว่าจะเริ่มเปิดเครื่องใหม่"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "ออกจากระบบ"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "ยกเลิก"
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "เริ่มเปิดเครื่องใหม่"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "1"
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "ปิดเครื่อง"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr "สลับบัญชีผู้ใช้..."
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "ออกจากระบบ"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "สลับจาก %s…"
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "เริ่มเปิดเครื่องใหม่..."
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "ซอฟต์แวร์เป็นรุ่นใหม่แล้ว"
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "ปิดเครื่อง..."
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "อัปเดตใหม่ออกแล้ว..."
+#~ msgid "Restart Instead"
+#~ msgstr "เปลี่ยนเป็นเริ่มเปิดเครื่องใหม่"
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "กำลังติดตั้งการปรับข้อมูล..."
+#~ msgid "Restart Instead…"
+#~ msgstr "เปลี่ยนเป็นเริ่มเปิดเครื่องใหม่…"
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr "เริ่มเครื่องใหม่เพื่อทำการปรับรุ่น..."
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr "การปรับข้อมูลในบางซอฟต์แวร์จะไม่มีผล จนกว่าจะเริ่มเปิดเครื่องใหม่"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "ตั้งค่าระบบ..."
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "1"
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "จอภาพ..."
+#~ msgid "Switch From %s…"
+#~ msgstr "สลับจาก %s…"
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "โปรแกรมเริ่มวาระ..."
+#~ msgid "Software Up to Date"
+#~ msgstr "ซอฟต์แวร์เป็นรุ่นใหม่แล้ว"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "อุปกรณ์ที่เชื่อมต่อแล้ว"
+#~ msgid "Updates Available…"
+#~ msgstr "อัปเดตใหม่ออกแล้ว..."
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "เครื่องพิมพ์"
+#~ msgid "Updates Installing…"
+#~ msgstr "กำลังติดตั้งการปรับข้อมูล..."
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "เครื่องสแกน"
+#~ msgid "Restart to Complete Updates…"
+#~ msgstr "เริ่มเครื่องใหม่เพื่อทำการปรับรุ่น..."
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "เว็บแคม"
+#~ msgid "Displays…"
+#~ msgstr "จอภาพ..."
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "พักเครื่อง"
+#~ msgid "Startup Applications…"
+#~ msgstr "โปรแกรมเริ่มวาระ..."
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "จำศีล"
+#~ msgid "Attached Devices"
+#~ msgstr "อุปกรณ์ที่เชื่อมต่อแล้ว"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "วาระผู้ใช้ชั่วคราว"
+#~ msgid "Printers"
+#~ msgstr "เครื่องพิมพ์"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "ผู้ใช้ชั่วคราว"
+#~ msgid "Scanners"
+#~ msgstr "เครื่องสแกน"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "บัญชีออนไลน์..."
+#~ msgid "Webcam"
+#~ msgstr "เว็บแคม"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "บัญชีผู้ใช้…"
+#~ msgid "User Accounts…"
+#~ msgstr "บัญชีผู้ใช้…"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "%s เว็บแคม"
+#~ msgid "%s Webcam"
+#~ msgstr "%s เว็บแคม"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "เครื่องสแกน"
+#~ msgid "Scanner"
+#~ msgstr "เครื่องสแกน"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "%s เครื่องสแกน"
+#~ msgid "%s Scanner"
+#~ msgstr "%s เครื่องสแกน"
 
 #~ msgid "Log Out..."
 #~ msgstr "ออกจากระบบ..."
@@ -293,7 +323,6 @@ msgstr "%s เครื่องสแกน"
 #~ msgid "Shut Down..."
 #~ msgstr "ปิดเครื่อง..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "สลับจาก %s..."
 
@@ -304,7 +333,8 @@ msgstr "%s เครื่องสแกน"
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
 #~ msgstr "การกระทำนี้มีผลทำให้ไม่เห็นปุ่มออกจากระบบในเมนูวาระ"
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "การกระทำนี้มีผลทำให้ไม่เห็นปุ่มเริ่มเปิดเครื่องใหม่ในเมนูวาระ"
 
 #~ msgid ""
@@ -318,9 +348,6 @@ msgstr "%s เครื่องสแกน"
 #~ msgid "Restart..."
 #~ msgstr "เริ่มเปิดเครื่องใหม่..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr "การปรับปรุงซอฟต์แวร์ในบางครั้งจะปรับใช้หลังจากเริ่มคอมพิวเตอร์ใหม่"
-
 #~ msgid "Restart Instead..."
 #~ msgstr "เริ่มเปิดเครื่องใหม่..."
 
diff --git a/po/ti.po b/po/ti.po
new file mode 100644
index 0000000..48a2343
--- /dev/null
+++ b/po/ti.po
@@ -0,0 +1,204 @@
+# Tigrinya translations for PACKAGE package.
+# Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
+"PO-Revision-Date: 2017-07-21 15:41+0200\n"
+"Last-Translator: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n"
+"Language-Team: Tigrinya\n"
+"Language: ti\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
+msgid ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
+msgid "Remove the Log Out item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
+msgid "Remove the Restart item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
+msgid "Remove the shutdown item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr ""
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
+msgstr ""
+
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
+
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
+
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
+
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
+
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
+
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
+
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
+
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
+
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
+
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
+
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
+
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
+msgstr ""
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr ""
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr ""
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
+msgid "Log Out"
+msgstr ""
+
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr ""
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr ""
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr ""
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr ""
+
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr ""
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:818
+msgid "Are you sure you want to close all programs and log out?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:819
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
diff --git a/po/tr.po b/po/tr.po
index a126350..799cbac 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2011-09-15 15:57+0000\n"
 "Last-Translator: Fatih Dayioglu <fatihdy@gmail.com>\n"
 "Language-Team: Turkish\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,277 +19,312 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr "Oturumu Kapat Düğmesini Oturum Menüsünde Görünür Yapar"
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+"Oturum kapatma, yeniden başlatma ve bilgisayarı kapatma eylemleri için onay "
+"iletişim kutusunu engelleyin"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr "Oturumu Yeniden Başlat Düğmesini Oturum Menüsünde Görünür Yapar"
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
-msgstr "Bilgisayarı Kapat Düğmesini Oturum Menüsünde Görünür Yapar"
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+"Oturum kapatma, yeniden başlatma ve bilgisayarı kapatma eylemlerinde onay "
+"iletişim kutusunu göster veya gösterme."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Oturumu Kapat öğesini oturum menüsünden  kaldır"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr "Oturumu Kapat Düğmesini Oturum Menüsünde Görünür Yapar"
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Yeniden Başlat öğesini oturum menüsünden kaldır"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr "Oturumu Yeniden Başlat Düğmesini Oturum Menüsünde Görünür Yapar"
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
 msgid "Remove the shutdown item from the session menu"
 msgstr "Bilgisayarı kapat öğesini oturum menüsünden kaldır"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr "Bilgisayarı Kapat Düğmesini Oturum Menüsünde Görünür Yapar"
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"Oturum kapatma, yeniden başlatma ve bilgisayarı kapatma eylemleri için onay "
-"iletişim kutusunu engelleyin"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
-"Oturum kapatma, yeniden başlatma ve bilgisayarı kapatma eylemlerinde onay "
-"iletişim kutusunu göster veya gösterme."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "Klasik Konuk Oturumu"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "Konuk"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "Klasik masaüstünü kullanarak bir konuk oturumu başlat"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Ekranı Kilitle"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Bilgisayarı Kapat"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Oturumu Kapat"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "Sistem Ayarları..."
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Yeniden Başlat"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "Çevrimiçi Hesaplar..."
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Oturumu Kapat..."
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Yeniden Başlat..."
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "Kullanıcı Hesabı Değiştir..."
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Bilgisayarı Kapat..."
+#: ../src/service.c:575 ../src/service.c:591
+#, fuzzy
+msgid "Switch Account"
+msgstr "Kullanıcı Hesabı Değiştir..."
+
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "Kullanıcı Hesabı Değiştir..."
+
+#: ../src/service.c:588
+#, fuzzy
+msgid "Lock/Switch Account"
+msgstr "Kullanıcı Hesabı Değiştir..."
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Konuk Oturumu"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Oturumu Kapat..."
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Oturumu Kapat"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Askıya Al"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Hazırda Beklet"
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr "Yeniden Başlat..."
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
 msgid "Restart"
 msgstr "Yeniden Başlat"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr "Bilgisayarı Kapat..."
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
 msgstr "Bilgisayarı Kapat"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr ""
 "Tüm programları sonlandırıp oturumu kapatmak istediğinize emin misiniz?"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+"Bazı yazılım güncelleştirmeleri bilgisayar yeniden başlatılıncaya kadar "
+"uygulanmayacak."
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "İptal"
+
+#: ../src/backend-dbus/actions.c:862
 msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
 "Tüm programları sonlandırıp bilgisayarı yeniden başlatmak istediğinize emin "
 "misiniz?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr ""
 "Tüm programları sonlandırıp bilgisayarı kapatmak istediğinize emin misiniz?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "Oturumu Kapat"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Yeniden Başlat"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Bilgisayarı Kapat"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Oturumu Kapat"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr "Yeniden Başlat..."
+#~ msgid "Classic Guest Session"
+#~ msgstr "Klasik Konuk Oturumu"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr "Kapat..."
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "Klasik masaüstünü kullanarak bir konuk oturumu başlat"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Yeniden Başlat"
+#~ msgid "Lock Screen"
+#~ msgstr "Ekranı Kilitle"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "Yeniden Başlatma Yerine...."
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Oturumu Kapat"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
-"Bazı Yazılımların Güncelemesi Bilgisayar Yeniden Başlatılana Kadar "
-"Uygulanamaz."
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Yeniden Başlat"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "İptal"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Bilgisayarı Kapat"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "1"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Oturumu Kapat"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr "Kullanıcı Hesabı Değiştir..."
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Yeniden Başlat"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "Geçiş Yapılan: %s..."
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Bilgisayarı Kapat"
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "Sisteminiz Güncel"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Oturumu Kapat"
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "Güncelleştirmeler Edinilebilir..."
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "Yeniden Başlat..."
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "Güncellemeler Yükleniyor..."
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "Kapat..."
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr "Güncellemeyi tamamlamak için yeniden başlatın..."
+#~ msgid "Restart Instead"
+#~ msgstr "Yeniden Başlat"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "Sistem Ayarları..."
+#~ msgid "Restart Instead…"
+#~ msgstr "Yeniden Başlatma Yerine...."
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "Ekranlar..."
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr ""
+#~ "Bazı Yazılımların Güncelemesi Bilgisayar Yeniden Başlatılana Kadar "
+#~ "Uygulanamaz."
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "Başlangıç Uygulamaları..."
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "1"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "Eklenen Aygıtlar"
+#~ msgid "Switch From %s…"
+#~ msgstr "Geçiş Yapılan: %s..."
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "Yazıcılar"
+#~ msgid "Software Up to Date"
+#~ msgstr "Sisteminiz Güncel"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "Tarayıcılar"
+#~ msgid "Updates Available…"
+#~ msgstr "Güncelleştirmeler Edinilebilir..."
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "Web Kamerası"
+#~ msgid "Updates Installing…"
+#~ msgstr "Güncellemeler Yükleniyor..."
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Askıya Al"
+#~ msgid "Restart to Complete Updates…"
+#~ msgstr "Güncellemeyi tamamlamak için yeniden başlatın..."
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Hazırda Beklet"
+#~ msgid "Displays…"
+#~ msgstr "Ekranlar..."
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Konuk Oturumu"
+#~ msgid "Startup Applications…"
+#~ msgstr "Başlangıç Uygulamaları..."
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "Konuk"
+#~ msgid "Attached Devices"
+#~ msgstr "Eklenen Aygıtlar"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "Çevrimiçi Hesaplar..."
+#~ msgid "Printers"
+#~ msgstr "Yazıcılar"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "Kullanıcı Hesapları..."
+#~ msgid "Scanners"
+#~ msgstr "Tarayıcılar"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "%s Webcam"
+#~ msgid "Webcam"
+#~ msgstr "Web Kamerası"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "Tarayıcı"
+#~ msgid "User Accounts…"
+#~ msgstr "Kullanıcı Hesapları..."
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "%s Tarayıcı"
+#~ msgid "%s Webcam"
+#~ msgstr "%s Webcam"
+
+#~ msgid "Scanner"
+#~ msgstr "Tarayıcı"
+
+#~ msgid "%s Scanner"
+#~ msgstr "%s Tarayıcı"
 
 #~ msgid "Log Out..."
 #~ msgstr "Oturumu Kapat..."
@@ -316,15 +352,9 @@ msgstr "%s Tarayıcı"
 #~ msgid "Shut Down..."
 #~ msgstr "Bilgisayarı Kapat..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Geçiş Yapılan: %s..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Bazı yazılım güncelleştirmeleri bilgisayar yeniden başlatılıncaya kadar "
-#~ "uygulanmayacak."
-
 #~ msgid "Restart to Complete Update…"
 #~ msgstr "Güncelleştirme İşlemini Tamamlamak için Yeniden Başlat..."
 
@@ -334,7 +364,8 @@ msgstr "%s Tarayıcı"
 #~ msgid "Session"
 #~ msgstr "Oturum"
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "Yeniden başlat düğmesinin oturum menüsünde görünmemesini sağlar."
 
 #~ msgid ""
diff --git a/po/ug.po b/po/ug.po
index 30385cc..e631acf 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2011-09-17 08:55+0000\n"
 "Last-Translator: Gheyret T.Kenji <Unknown>\n"
 "Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,274 +19,308 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr "بۇنىڭ بىلەن چىقىش توپچىسى ئەڭگىمە تىزىملىكىدە كۆرۈنمەيدىغان بولىدۇ."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+"تىزىمدىن چىق، قايتا قوزغات ۋە تاقا مەشغۇلاتلارنى جەزمەلەشنى كۆرسىتىدىغان "
+"سۆزلەشكۈنى چەكلە"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgid ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
-"بۇنىڭ بىلەن قايتا قوزغىتىش توپچىسى ئەڭگىمە تىزىملىكىدە كۆرۈنمەيدىغان بولىدۇ."
+"تىزىمدىن چىق، قايتا قوزغات ۋە تاقا مەشغۇلاتلارنى جەزملەشنى كۆرسىتىدىغان "
+"سۆزلەشكۈنى كۆرسىتەمدۇ يوق."
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
-msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
-msgstr "بۇنىڭ بىلەن تاقاش توپچىسى ئەڭگىمە تىزىملىكىدە كۆرۈنمەيدىغان بولىدۇ."
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
 msgid "Remove the Log Out item from the session menu"
 msgstr "ئەڭگىمە بۇيرۇق تىزىملىكىدىن تىزىمدىن چىق تۈرىنى چىقىرىۋەت"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr "بۇنىڭ بىلەن چىقىش توپچىسى ئەڭگىمە تىزىملىكىدە كۆرۈنمەيدىغان بولىدۇ."
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "session بۇيرۇق تىزىملىكىدىن قايتا قوزغاش دېگەن تۈرىنى ئۆچۈرۈش"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
+"بۇنىڭ بىلەن قايتا قوزغىتىش توپچىسى ئەڭگىمە تىزىملىكىدە كۆرۈنمەيدىغان بولىدۇ."
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
 msgid "Remove the shutdown item from the session menu"
 msgstr "session بۇيرۇق تىزىملىكىدىن shutdown دېگەن تۈرىنى ئۆچۈرۈش"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr "بۇنىڭ بىلەن تاقاش توپچىسى ئەڭگىمە تىزىملىكىدە كۆرۈنمەيدىغان بولىدۇ."
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"تىزىمدىن چىق، قايتا قوزغات ۋە تاقا مەشغۇلاتلارنى جەزمەلەشنى كۆرسىتىدىغان "
-"سۆزلەشكۈنى چەكلە"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
-"تىزىمدىن چىق، قايتا قوزغات ۋە تاقا مەشغۇلاتلارنى جەزملەشنى كۆرسىتىدىغان "
-"سۆزلەشكۈنى كۆرسىتەمدۇ يوق."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "كلاسسىك مېھمان ئەڭگىمەسى"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "مېھمان"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "كلاسسىك ئۈستەلئۈستىنى ئىشلىتىپ مېھمان ئەڭگىمەسىنى باشلايدۇ"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "ئېكراننى قۇلۇپلاش"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "تاقا"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "تىزىمدىن چىق"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "سىستېما تەڭشىكى…"
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "قايتا قوزغات"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "توردىكى ھېساباتلار…"
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "تىزىمدىن چىقىش..."
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "قايتا قوزغىتىش..."
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "ئىشلەتكۈچى ھېساباتىنى ئالماشتۇرۇش…"
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "توكنى ئۈزۈش..."
+#: ../src/service.c:575 ../src/service.c:591
+#, fuzzy
+msgid "Switch Account"
+msgstr "ئىشلەتكۈچى ھېساباتىنى ئالماشتۇرۇش…"
+
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "ئىشلەتكۈچى ھېساباتىنى ئالماشتۇرۇش…"
+
+#: ../src/service.c:588
+#, fuzzy
+msgid "Lock/Switch Account"
+msgstr "ئىشلەتكۈچى ھېساباتىنى ئالماشتۇرۇش…"
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "مېھمان ئەڭگىمە"
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "تىزىمدىن چىقىش..."
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "تىزىمدىن چىق"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "توڭلات"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "ئۈچەك"
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr "قايتا قوزغىتىش..."
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
 msgid "Restart"
 msgstr "قايتا قوزغات"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr "توكنى ئۈزۈش..."
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
-msgstr "تاقاش"
+msgstr "تاقا"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr "ھەممە پروگراممىنى يېپىپ كومپيۇتېرنى تىزىمدىن چىقىرامسىز؟"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr "قايتا قوزغاتمىغۇچە بىر قىسىم يېڭىلانمىلار ئىشلىمەيدۇ"
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "ۋاز كەچ"
+
+#: ../src/backend-dbus/actions.c:862
 msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr "ھەممە پروگراممىنى ئېتىپ كومپيۇتېرنى قايتا قوزغامسىز؟"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr "ھەممە پروگراممىنى ئېتىپ كومپيۇتېرنى تاقامسىز؟"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "تىزىمدىن چىق"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "قايتا قوزغات"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "تاقا"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "تىزىمدىن چىق"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr "قايتا قوزغىتىش..."
+#~ msgid "Classic Guest Session"
+#~ msgstr "كلاسسىك مېھمان ئەڭگىمەسى"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr "تاقاش…"
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "كلاسسىك ئۈستەلئۈستىنى ئىشلىتىپ مېھمان ئەڭگىمەسىنى باشلايدۇ"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "ئۇنداق قىلغۇچە قايتا قوزغىتىڭ"
+#~ msgid "Lock Screen"
+#~ msgstr "ئېكراننى قۇلۇپلاش"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "ئورنىغا قايتا باشلا…"
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "تىزىمدىن چىق"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr "كومپيۇتېر قايتا قوزغىتىلمىغۇچە بەزى يېڭىلانمىلار قوللىنىلمايدۇ."
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "قايتا قوزغات"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "ۋاز كەچ"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "تاقاش"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "1"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "تىزىمدىن چىق"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr "ئىشلەتكۈچى ھېساباتىنى ئالماشتۇرۇش…"
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "قايتا قوزغات"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "%s دىن ئالماشتۇرۇش…"
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "تاقا"
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "سىستېما ئەڭ يېڭى ھالەتتە"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "تىزىمدىن چىق"
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "يېڭىلانمىلار بار…"
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "قايتا قوزغىتىش..."
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "يېڭىلانمىلار ئورنىتىلىۋاتىدۇ…"
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "تاقاش…"
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr "يېڭىلاشنى تاماملاش ئۈچۈن قايتا باشلاش…"
+#~ msgid "Restart Instead"
+#~ msgstr "ئۇنداق قىلغۇچە قايتا قوزغىتىڭ"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "سىستېما تەڭشىكى…"
+#~ msgid "Restart Instead…"
+#~ msgstr "ئورنىغا قايتا باشلا…"
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "كۆرسەتكۈچلەر"
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr "كومپيۇتېر قايتا قوزغىتىلمىغۇچە بەزى يېڭىلانمىلار قوللىنىلمايدۇ."
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "باشلانغاندا ئىجرا بولىدىغان پروگراممىلار"
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "1"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "ئۇلانغان ئۈسكۈنىلەر"
+#~ msgid "Switch From %s…"
+#~ msgstr "%s دىن ئالماشتۇرۇش…"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "پىرىنتېرلار"
+#~ msgid "Software Up to Date"
+#~ msgstr "سىستېما ئەڭ يېڭى ھالەتتە"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "شويلىلىغۇچ"
+#~ msgid "Updates Available…"
+#~ msgstr "يېڭىلانمىلار بار…"
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "توركامېرا"
+#~ msgid "Updates Installing…"
+#~ msgstr "يېڭىلانمىلار ئورنىتىلىۋاتىدۇ…"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "توڭلات"
+#~ msgid "Restart to Complete Updates…"
+#~ msgstr "يېڭىلاشنى تاماملاش ئۈچۈن قايتا باشلاش…"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "ئۈچەك"
+#~ msgid "Displays…"
+#~ msgstr "كۆرسەتكۈچلەر"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "مېھمان ئەڭگىمە"
+#~ msgid "Startup Applications…"
+#~ msgstr "باشلانغاندا ئىجرا بولىدىغان پروگراممىلار"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "مېھمان"
+#~ msgid "Attached Devices"
+#~ msgstr "ئۇلانغان ئۈسكۈنىلەر"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "توردىكى ھېساباتلار…"
+#~ msgid "Printers"
+#~ msgstr "پىرىنتېرلار"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "ئىشلەتكۈچى ھېساباتلىرى…"
+#~ msgid "Scanners"
+#~ msgstr "شويلىلىغۇچ"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "%s تور كامېراسى"
+#~ msgid "Webcam"
+#~ msgstr "توركامېرا"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "سايىلىغۇچ"
+#~ msgid "User Accounts…"
+#~ msgstr "ئىشلەتكۈچى ھېساباتلىرى…"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "%s سايىلىغۇچ"
+#~ msgid "%s Webcam"
+#~ msgstr "%s تور كامېراسى"
+
+#~ msgid "Scanner"
+#~ msgstr "سايىلىغۇچ"
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid "%s Scanner"
+#~ msgstr "%s سايىلىغۇچ"
+
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr ""
 #~ "قايتا قوزغىتىش توپچىسىنى session بۇيرۇق تىزىملىكىدە كۆرسەتمەيدىغان قىلىش"
 
@@ -293,9 +328,6 @@ msgstr "%s سايىلىغۇچ"
 #~ "Makes it so that the shutdown button doesn't show in the session menu."
 #~ msgstr "shutdown توپچىسىنى session بۇيرۇق تىزىملىكىدە كۆرسەتمەيدىغان قىلىش"
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr "قايتا قوزغاتمىغۇچە بىر قىسىم يېڭىلانمىلار ئىشلىمەيدۇ"
-
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
 #~ msgstr "تىزىمدىن چىق توپچىسىنى ئەڭگىمە بۇيرۇق تىزىملىكىدە كۆرسەتمە."
 
@@ -312,7 +344,6 @@ msgstr "%s سايىلىغۇچ"
 #~ msgid "Switch User..."
 #~ msgstr "ئىشلەتكۈچىنى ئالماشتۇر…"
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "%s دىن ئالماشتۇر…"
 
diff --git a/po/uk.po b/po/uk.po
index 55c5099..5f42002 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2011-09-09 13:54+0000\n"
 "Last-Translator: Andriy Korchak <kharts@ukr.net>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,274 +19,280 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr "Робить так, що кнопка виходу не відображається в меню сесії."
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+"Не показувати діалог підтвердження під час завершення сеансу, вимикання та "
+"перезавантаження"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgid ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
-"Робить так, що кнопка перезавантаження не відображається в меню сесії."
+"Чи показувати діалог підтвердження під час завершення сеансу, вимикання та "
+"перезавантаження."
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
-msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
-msgstr "Робить так, що кнопка вимкнення не відображається в меню сесії."
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
 msgid "Remove the Log Out item from the session menu"
 msgstr "Прибрати пункт «Завершити сеанс» з меню"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr "Робить так, що кнопка виходу не відображається в меню сесії."
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Прибрати пункт «Перезавантаження» з меню"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr "Робить так, що кнопка перезавантаження не відображається в меню сесії."
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
 msgid "Remove the shutdown item from the session menu"
 msgstr "Прибрати пункт «Вимкнути комп’ютер» з меню"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr "Робить так, що кнопка вимкнення не відображається в меню сесії."
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
-"Не показувати діалог підтвердження під час завершення сеансу, вимикання та "
-"перезавантаження"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
-"Чи показувати діалог підтвердження під час завершення сеансу, вимикання та "
-"перезавантаження."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "Класичний гостьовий сеанс"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "Гість"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
 msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Заблокувати екран"
-
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Вимкнути"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Завершити сеанс"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Перезавантажити"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "Системні параметри..."
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Завершити сеанс..."
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Перезавантажити..."
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Вимкнути..."
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "Облікові записи..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "Завершення сеансу"
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "Перезавантаження"
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
-msgstr "Вимкнення"
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
-msgstr "Ви дійсно бажаєте закрити всі програми та завершити поточний сеанс?"
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
-msgstr "Ви дійсно бажаєте закрити всі програми та перезавантажити комп'ютер?"
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Гостьовий сеанс"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
-msgstr "Ви дійсно бажаєте закрити всі програми та вимкнути комп'ютер?"
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Завершити сеанс..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Завершити сеанс"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Перезавантажити"
-
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Вимкнути"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Режим очікування"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Завершити сеанс"
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Режим сну"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
+#: ../src/service.c:722
 msgid "Restart…"
 msgstr "Перезавантажити..."
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "Перезавантажити"
+
+#: ../src/service.c:729
 msgid "Shut Down…"
 msgstr "Вимкнути..."
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Перезавантажити"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr "Вимкнути"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
+msgstr "Ви дійсно бажаєте закрити всі програми та завершити поточний сеанс?"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
 msgstr ""
-"Деякі оновлення програм не вступлять в силу доки комп'ютер не буде "
-"перезавантажений."
+"Деякі оновлення будуть застосовані лише після перезавантаження комп'ютера."
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
 msgid "Cancel"
 msgstr "Скасувати"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "1"
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr "Ви дійсно бажаєте закрити всі програми та перезавантажити комп'ютер?"
+
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr "Ви дійсно бажаєте закрити всі програми та вимкнути комп'ютер?"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "Наявні оновлення..."
+#~ msgid "Classic Guest Session"
+#~ msgstr "Класичний гостьовий сеанс"
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "Встановлення оновлень..."
+#~ msgid "Lock Screen"
+#~ msgstr "Заблокувати екран"
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Завершення сеансу"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "Системні параметри..."
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Перезавантаження"
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "Монітори..."
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Вимкнення"
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "Автозапуск програм...."
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Завершити сеанс"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "Під’єднані пристрої"
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Перезавантажити"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "Принтери"
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Вимкнути"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "Сканери"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Завершити сеанс"
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "Веб-камера"
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "Перезавантажити..."
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Режим очікування"
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "Вимкнути..."
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Режим сну"
+#~ msgid "Restart Instead"
+#~ msgstr "Перезавантажити"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Гостьовий сеанс"
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr ""
+#~ "Деякі оновлення програм не вступлять в силу доки комп'ютер не буде "
+#~ "перезавантажений."
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "Гість"
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "1"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr ""
+#~ msgid "Updates Available…"
+#~ msgstr "Наявні оновлення..."
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "Облікові записи..."
+#~ msgid "Updates Installing…"
+#~ msgstr "Встановлення оновлень..."
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr ""
+#~ msgid "Displays…"
+#~ msgstr "Монітори..."
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "Сканер"
+#~ msgid "Startup Applications…"
+#~ msgstr "Автозапуск програм...."
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr ""
+#~ msgid "Attached Devices"
+#~ msgstr "Під’єднані пристрої"
+
+#~ msgid "Printers"
+#~ msgstr "Принтери"
+
+#~ msgid "Scanners"
+#~ msgstr "Сканери"
+
+#~ msgid "Webcam"
+#~ msgstr "Веб-камера"
+
+#~ msgid "Scanner"
+#~ msgstr "Сканер"
 
 #~ msgid "Shut Down..."
 #~ msgstr "Вимкнути..."
@@ -306,11 +313,6 @@ msgstr ""
 #~ msgid "Restart Instead..."
 #~ msgstr "Перезавантажити..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Деякі оновлення будуть застосовані лише після перезавантаження комп'ютера."
-
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Переключитись з %s..."
 
@@ -321,7 +323,8 @@ msgstr ""
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
 #~ msgstr "Вимкнути показ кнопки «Завершити сеанс» в меню."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "Вимкнути показ кнопки «Перезавантаження» в меню."
 
 #~ msgid ""
diff --git a/po/ur.po b/po/ur.po
index f927508..44f098e 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2011-06-22 03:51+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Urdu <ur@li.org>\n"
+"Language: ur\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,271 +19,236 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr ""
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr "لاگ ائوت، دوبارہ شروع یا بند کرنے کے مکالمے کو دبائیں"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
+"لاگ ائوت، دوبارہ شروع یا بند کرنے کے عمل کے تصدیقی مکالموں کو دِکھانا ہے یا "
+"نہیں"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "دورانیہ فِہرست میں سے  لاگ آئوٹ کرنے والی صفت کو ہٹا دیں"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "دورانیہ فِہرست میں سے دوبارہ شروع کرنے والی صفت کو ہٹا دیں"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
-msgstr "دورانیہ فِہرست میں سے بند کرنے والے صفت کو ہٹا دیں"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
-msgstr "لاگ ائوت، دوبارہ شروع یا بند کرنے کے مکالمے کو دبائیں"
+msgid "Remove the shutdown item from the session menu"
+msgstr "دورانیہ فِہرست میں سے بند کرنے والے صفت کو ہٹا دیں"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
-"لاگ ائوت، دوبارہ شروع یا بند کرنے کے عمل کے تصدیقی مکالموں کو دِکھانا ہے یا "
-"نہیں"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
 msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
+#: ../src/service.c:191
+msgid "System"
 msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "اسکرین مقفل کریں"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "بند"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "لاگ آؤٹ"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "دوباره شروع"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "لاگ ائوٹ"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "دوبارہ شروع…"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "بند کریں…"
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "لاگ آؤٹ"
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "دوباره شروع"
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
-msgid "Shut Down"
-msgstr "بند"
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
 msgstr ""
-"کیا آپ واقعی تمام پروگرام بند کرکے کمپیوٹر سے لاگ ائوٹ کرنا چاہتے ہیں؟"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
-msgid "Are you sure you want to close all programs and restart the computer?"
+#: ../src/service.c:594
+msgid "Lock"
 msgstr ""
-"کیا آپ واقعی تمام پروگرام بند کرکے کمپیوٹر کو دوباره شروع کرنا چاہتے ہیں؟"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
-msgstr "کیا آپ واقعی تمام پروگرام بند کرکے کمپیوٹر کو بند کرنا چاہتے ہیں؟"
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "مِہمان دورانیہ"
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "لاگ ائوٹ"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "لاگ آؤٹ"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "دوباره شروع"
-
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "بند"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "معطل"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "لاگ آؤٹ"
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "غنودگی"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
+#: ../src/service.c:722
 msgid "Restart…"
-msgstr ""
+msgstr "دوبارہ شروع…"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "دوباره شروع"
+
+#: ../src/service.c:729
 msgid "Shut Down…"
-msgstr ""
+msgstr "بند کریں…"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "اس کے بجائے دوبارہ شروع کریں"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr "بند"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
+msgstr "کیا آپ واقعی تمام پروگرام بند کرکے کمپیوٹر سے لاگ ائوٹ کرنا چاہتے ہیں؟"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
 msgstr ""
+"کچھ سافٹ ویئر اپ ڈیٹس کمپیوٹرکو اگلی دفعہ دوبارہ شروع کرنے تک لاگو نہیں ہو "
+"نگی."
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
 msgid "Cancel"
 msgstr "منسوخ کریں"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "1"
-
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr ""
-
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr ""
-
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr ""
-
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr ""
+"کیا آپ واقعی تمام پروگرام بند کرکے کمپیوٹر کو دوباره شروع کرنا چاہتے ہیں؟"
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr ""
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr "کیا آپ واقعی تمام پروگرام بند کرکے کمپیوٹر کو بند کرنا چاہتے ہیں؟"
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
 msgstr ""
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr ""
+#~ msgid "Lock Screen"
+#~ msgstr "اسکرین مقفل کریں"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "لاگ آؤٹ"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "دوباره شروع"
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "بند"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "معطل"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "لاگ آؤٹ"
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "غنودگی"
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "دوباره شروع"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "مِہمان دورانیہ"
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "بند"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr ""
-
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr ""
-
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr ""
-
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr ""
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "لاگ آؤٹ"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr ""
+#~ msgid "Restart Instead"
+#~ msgstr "اس کے بجائے دوبارہ شروع کریں"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr ""
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "1"
 
 #~ msgid "Shut Down..."
 #~ msgstr "بند کرڈالیں..."
@@ -310,7 +276,6 @@ msgstr ""
 #~ msgid "Session"
 #~ msgstr "دورانیہ"
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "تبدیل کریں %s  سے..."
 
@@ -320,15 +285,11 @@ msgstr ""
 #~ msgid "Restart to Complete Update"
 #~ msgstr "تجدید مکمل کرنے کے لئے دوبارہ شروع کریں"
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "کچھ سافٹ ویئر اپ ڈیٹس کمپیوٹرکو اگلی دفعہ دوبارہ شروع کرنے تک لاگو نہیں ہو "
-#~ "نگی."
-
 #~ msgid "Makes it so that the logout button doesn't show in the session menu."
 #~ msgstr "لاگ ائوت کرنے  والے بٹن کو دورانیہ فہرست میں نہیں دِکھائییے۔"
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "دوبارہ شروع کرنے  والے بٹن کو دورانیہ فہرست میں نہیں دِکھائییے۔"
 
 #~ msgid ""
diff --git a/po/uz.po b/po/uz.po
new file mode 100644
index 0000000..e313338
--- /dev/null
+++ b/po/uz.po
@@ -0,0 +1,204 @@
+# Uzbek translations for PACKAGE package.
+# Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
+"PO-Revision-Date: 2017-07-21 15:41+0200\n"
+"Last-Translator: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n"
+"Language-Team: Uzbek\n"
+"Language: uz\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
+msgid ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
+msgid "Remove the Log Out item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
+msgid "Remove the Restart item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
+msgid "Remove the shutdown item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr ""
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
+msgstr ""
+
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
+
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
+
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
+
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
+
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
+
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
+
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
+
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
+
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
+
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
+
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
+
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
+msgstr ""
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr ""
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr ""
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
+msgid "Log Out"
+msgstr ""
+
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr ""
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr ""
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr ""
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr ""
+
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr ""
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:818
+msgid "Are you sure you want to close all programs and log out?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:819
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
diff --git a/po/vi.po b/po/vi.po
index 5cf539c..196b939 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2011-09-03 06:41+0000\n"
 "Last-Translator: Lê Hoàng Phương <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
+"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,271 +19,298 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr ""
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr "Bỏ hộp thoại xác nhận hành động đăng xuất, khởi động lại và tắt máy"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr ""
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
 msgstr ""
+"Hiển thị hay không hộp thoại xác nhận hành động đăng xuất, khởi động lại và "
+"tắt máy."
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "Loại bỏ mục Đăng xuất khỏi trình đơn phiên làm việc"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "Gỡ mục Khởi động lại khỏi trình đơn phiên làm việc"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
-msgstr "Gỡ mục Tắt máy khỏi trình đơn phiên làm việc"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
-msgstr "Bỏ hộp thoại xác nhận hành động đăng xuất, khởi động lại và tắt máy"
+msgid "Remove the shutdown item from the session menu"
+msgstr "Gỡ mục Tắt máy khỏi trình đơn phiên làm việc"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
 msgstr ""
-"Hiển thị hay không hộp thoại xác nhận hành động đăng xuất, khởi động lại và "
-"tắt máy."
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "Phiên làm việc cho khách cổ điển"
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
+msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "Khởi động phiên làm việc cho khách sử dụng bàn làm việc cổ điển"
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "Khoá màn hình"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "Khách"
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "Tắt máy"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "Đăng xuất"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "Khởi động lại"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "Đăng xuất..."
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "Thiết lập hệ thống..."
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "Khởi động lại..."
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "Tài khoản trực tuyến..."
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "Tắt máy..."
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
+
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "Tài khoản trực tuyến..."
+
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
+
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "Tài khoản trực tuyến..."
+
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
+msgstr ""
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "Phiên làm việc cho khách"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "Đăng xuất..."
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "Đăng xuất"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "Tạm dừng"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "Ngủ đông"
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr "Khởi động lại..."
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
 msgid "Restart"
 msgstr "Khởi động lại"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr "Tắt máy..."
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
 msgstr "Tắt máy"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
+msgstr "Bạn có chắc muốn đóng tất cả chương trình và đăng xuất khỏi máy tính?"
+
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
 msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+"Some software updates won't be applied until the computer next restarts."
 msgstr ""
-"Bạn có chắc muốn đóng tất cả chương trình và đăng xuất khỏi máy tính?"
+"Một vài cập nhật phần mềm không thể được sử dụng cho đến lần khởi động lại "
+"máy kế tiếp"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "Hủy"
+
+#: ../src/backend-dbus/actions.c:862
 msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr "Bạn có chắc muốn đóng tất cả chương trình và khởi động lại máy tính?"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr "Bạn có chắc muốn đóng tất cả chương trình và tắt máy tính?"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "Đăng xuất"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "Khởi động lại"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "Tắt máy"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "Đăng xuất"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr "Khởi động lại..."
+#~ msgid "Classic Guest Session"
+#~ msgstr "Phiên làm việc cho khách cổ điển"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr "Tắt máy..."
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "Khởi động phiên làm việc cho khách sử dụng bàn làm việc cổ điển"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "Khởi động lại để cập nhật"
+#~ msgid "Lock Screen"
+#~ msgstr "Khoá màn hình"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr ""
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "Đăng xuất"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr ""
-"Một vài cập nhật phần mềm sẽ chưa áp dụng cho đến lần khởi động máy kế tiếp."
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "Khởi động lại"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "Hủy"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "Tắt máy"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "1"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "Đăng xuất"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr ""
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "Khởi động lại"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "Chuyển từ %s..."
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "Tắt máy"
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "Cập nhật phần mềm"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "Đăng xuất"
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "Cập nhật sẵn sàng..."
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "Khởi động lại..."
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "Đang cài đặt cập nhật..."
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "Tắt máy..."
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr ""
+#~ msgid "Restart Instead"
+#~ msgstr "Khởi động lại để cập nhật"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "Thiết lập hệ thống..."
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr ""
+#~ "Một vài cập nhật phần mềm sẽ chưa áp dụng cho đến lần khởi động máy kế "
+#~ "tiếp."
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "Màn hình..."
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "1"
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "Ứng dụng khởi chạy..."
+#~ msgid "Switch From %s…"
+#~ msgstr "Chuyển từ %s..."
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "Thiết bị đã gắn kết"
+#~ msgid "Software Up to Date"
+#~ msgstr "Cập nhật phần mềm"
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "Máy in"
+#~ msgid "Updates Available…"
+#~ msgstr "Cập nhật sẵn sàng..."
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "Máy quét"
+#~ msgid "Updates Installing…"
+#~ msgstr "Đang cài đặt cập nhật..."
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "Webcam"
+#~ msgid "Displays…"
+#~ msgstr "Màn hình..."
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "Tạm dừng"
+#~ msgid "Startup Applications…"
+#~ msgstr "Ứng dụng khởi chạy..."
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "Ngủ đông"
+#~ msgid "Attached Devices"
+#~ msgstr "Thiết bị đã gắn kết"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "Phiên làm việc cho khách"
+#~ msgid "Printers"
+#~ msgstr "Máy in"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "Khách"
+#~ msgid "Scanners"
+#~ msgstr "Máy quét"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "Tài khoản trực tuyến..."
+#~ msgid "Webcam"
+#~ msgstr "Webcam"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "Tài khoản người dùng..."
+#~ msgid "User Accounts…"
+#~ msgstr "Tài khoản người dùng..."
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "Webcam %s"
+#~ msgid "%s Webcam"
+#~ msgstr "Webcam %s"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "Máy quét"
+#~ msgid "Scanner"
+#~ msgstr "Máy quét"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "Máy quét %s"
+#~ msgid "%s Scanner"
+#~ msgstr "Máy quét %s"
 
 #~ msgid "Restart..."
 #~ msgstr "Khởi động lại..."
@@ -296,7 +324,6 @@ msgstr "Máy quét %s"
 #~ msgid "Switch User..."
 #~ msgstr "Chuyển người dùng..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "Chuyển từ người dùng %s..."
 
@@ -311,15 +338,11 @@ msgstr "Máy quét %s"
 #~ msgid "Restart..."
 #~ msgstr "Khởi động lại..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr ""
-#~ "Một vài cập nhật phần mềm không thể được sử dụng cho đến lần khởi động lại "
-#~ "máy kế tiếp"
-
 #~ msgid "Restart Instead..."
 #~ msgstr "Khởi động lại để cập nhật..."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr ""
 #~ "Làm cho nút Khởi động lại không hiển thị trên trình đơn phiên làm việc"
 
diff --git a/po/wae.po b/po/wae.po
new file mode 100644
index 0000000..5aed2cc
--- /dev/null
+++ b/po/wae.po
@@ -0,0 +1,204 @@
+# Language wae translations for PACKAGE package.
+# Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
+"PO-Revision-Date: 2017-07-21 15:41+0200\n"
+"Last-Translator: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n"
+"Language-Team: Language wae\n"
+"Language: wae\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
+msgid ""
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
+msgid "Remove the Log Out item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
+msgid "Remove the Restart item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
+msgid "Remove the shutdown item from the session menu"
+msgstr ""
+
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr ""
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
+msgstr ""
+
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
+
+#: ../src/service.c:325
+msgid "Guest"
+msgstr ""
+
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
+
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
+
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
+
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr ""
+
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr ""
+
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
+
+#: ../src/service.c:574 ../src/service.c:590
+msgid "Switch Account…"
+msgstr ""
+
+#: ../src/service.c:575 ../src/service.c:591
+msgid "Switch Account"
+msgstr ""
+
+#: ../src/service.c:587
+msgid "Lock/Switch Account…"
+msgstr ""
+
+#: ../src/service.c:588
+msgid "Lock/Switch Account"
+msgstr ""
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr ""
+
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr ""
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
+msgid "Log Out"
+msgstr ""
+
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr ""
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr ""
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr ""
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr ""
+
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr ""
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
+msgid "Shut Down"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:818
+msgid "Are you sure you want to close all programs and log out?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:819
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:862
+msgid "Are you sure you want to close all programs and restart the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
+
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 49b94ec..90906d6 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2011-09-15 13:13+0000\n"
 "Last-Translator: Xhacker Liu <liu.dongyuan@gmail.com>\n"
 "Language-Team: Chinese (simplified)\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,267 +19,300 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr "用它来隐藏会话菜单中的注销按钮。"
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr "禁止确认注销、重新启动和关机操作的对话框出现"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr "用它来隐藏会话菜单中的重启按钮。"
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
-msgstr "用它来隐藏会话菜单中的关机按钮。"
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr "是否显示确认注销、重新启动和关机操作的对话框。"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "移除会话菜单中的注销项"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr "用它来隐藏会话菜单中的注销按钮。"
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "移除会话菜单中的重启项"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
-msgstr "移除会话菜单中的关机项"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr "用它来隐藏会话菜单中的重启按钮。"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
-msgstr "禁止确认注销、重新启动和关机操作的对话框出现"
+msgid "Remove the shutdown item from the session menu"
+msgstr "移除会话菜单中的关机项"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
-msgstr "是否显示确认注销、重新启动和关机操作的对话框。"
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr "用它来隐藏会话菜单中的关机按钮。"
+
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
+msgstr ""
+
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "传统客人会话"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "访客"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "以传统桌面环境启动客人会话"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "锁定屏幕"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "关机"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "注销"
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "系统设置…"
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "重启"
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "在线账户…"
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
+
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "切换用户帐号..."
+
+#: ../src/service.c:575 ../src/service.c:591
+#, fuzzy
+msgid "Switch Account"
+msgstr "切换用户帐号..."
+
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "切换用户帐号..."
+
+#: ../src/service.c:588
+#, fuzzy
+msgid "Lock/Switch Account"
+msgstr "切换用户帐号..."
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "客人会话"
+
+#: ../src/service.c:696
 msgid "Log Out…"
 msgstr "注销..."
 
-#: ../src/settings-helper.c:89
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
+msgid "Log Out"
+msgstr "注销"
+
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "待机"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "休眠"
+
+#: ../src/service.c:722
 msgid "Restart…"
 msgstr "重启..."
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
+msgid "Restart"
+msgstr "重启"
+
+#: ../src/service.c:729
 msgid "Shut Down…"
 msgstr "关机..."
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
-msgid "Log Out"
-msgstr "注销"
-
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
-msgid "Restart"
-msgstr "重新启动"
-
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
 msgstr "关机"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr "您确定要关闭所有程序并注销？"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr "一些软件更新要在计算机重启后生效。"
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "取消"
+
+#: ../src/backend-dbus/actions.c:862
 msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr "您确定要关闭所有程序并重新启动计算机？"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr "您确定要关闭所有程序并关闭计算机？"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "注销"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "重新启动"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "关机"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "注销"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr "重启..."
+#~ msgid "Classic Guest Session"
+#~ msgstr "传统客人会话"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr "关机..."
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "以传统桌面环境启动客人会话"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "改为重启"
+#~ msgid "Lock Screen"
+#~ msgstr "锁定屏幕"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "转为重启..."
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "注销"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr "某些软件更新将在计算机下次重启时应用"
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "重新启动"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "取消"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "关机"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "切换用户..."
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "注销"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr "切换用户帐号..."
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "重新启动"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "切换自 %s..."
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "关机"
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "软件更新"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "注销"
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "有可用更新…"
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "重启..."
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "正在安装更新…"
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "关机..."
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr "重启以完成更新..."
+#~ msgid "Restart Instead"
+#~ msgstr "改为重启"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "系统设置…"
+#~ msgid "Restart Instead…"
+#~ msgstr "转为重启..."
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "显示…"
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr "某些软件更新将在计算机下次重启时应用"
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "启动应用程序…"
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "切换用户..."
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "已连接的设备"
+#~ msgid "Switch From %s…"
+#~ msgstr "切换自 %s..."
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "打印机"
+#~ msgid "Software Up to Date"
+#~ msgstr "软件更新"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "扫描仪"
+#~ msgid "Updates Available…"
+#~ msgstr "有可用更新…"
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "摄像头"
+#~ msgid "Updates Installing…"
+#~ msgstr "正在安装更新…"
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "待机"
+#~ msgid "Restart to Complete Updates…"
+#~ msgstr "重启以完成更新..."
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "休眠"
+#~ msgid "Displays…"
+#~ msgstr "显示…"
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "客人会话"
+#~ msgid "Startup Applications…"
+#~ msgstr "启动应用程序…"
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "访客"
+#~ msgid "Attached Devices"
+#~ msgstr "已连接的设备"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "在线账户…"
+#~ msgid "Printers"
+#~ msgstr "打印机"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "用户账户…"
+#~ msgid "Scanners"
+#~ msgstr "扫描仪"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "%s 网络摄像头"
+#~ msgid "Webcam"
+#~ msgstr "摄像头"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "扫描仪"
+#~ msgid "User Accounts…"
+#~ msgstr "用户账户…"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "%s 扫描仪"
+#~ msgid "%s Webcam"
+#~ msgstr "%s 网络摄像头"
+
+#~ msgid "Scanner"
+#~ msgstr "扫描仪"
+
+#~ msgid "%s Scanner"
+#~ msgstr "%s 扫描仪"
 
 #~ msgid "Log Out..."
 #~ msgstr "注销..."
@@ -295,13 +329,9 @@ msgstr "%s 扫描仪"
 #~ msgid "Restart Instead..."
 #~ msgstr "改为重启..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "从 %s 切换..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr "一些软件更新要在计算机重启后生效。"
-
 #~ msgctxt "button auth"
 #~ msgid "Restart..."
 #~ msgstr "重启..."
@@ -313,7 +343,8 @@ msgstr "%s 扫描仪"
 #~ msgid "Shut Down..."
 #~ msgstr "关机..."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "使重启按钮不在会话菜单中显示。"
 
 #~ msgid ""
diff --git a/po/zh_HK.po b/po/zh_HK.po
index fb2318c..6a08641 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2011-09-16 07:56+0000\n"
 "Last-Translator: Roy Chan <roy.chan@linux.org.hk>\n"
 "Language-Team: Chinese (Hong Kong) <zh_HK@li.org>\n"
+"Language: zh_HK\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,267 +19,300 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr "讓登出按鈕不顯示在工作階段選單內。"
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr "停止確定登出、重新啟動和關機的對話框"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr "讓登出按鈕不顯示在工作階段選單內。"
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
-msgstr "讓關機按鈕不顯示在工作階段選單內。"
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr "是否要顯示確定登出、重新啟動和關機的對話框。"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "從作業階段選單中移除「登出」項目"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr "讓登出按鈕不顯示在工作階段選單內。"
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "從工作階段選單中移除「重新啟動」項目"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
-msgstr "從工作階段選單中移除「關機」項目"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr "讓登出按鈕不顯示在工作階段選單內。"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
-msgstr "停止確定登出、重新啟動和關機的對話框"
+msgid "Remove the shutdown item from the session menu"
+msgstr "從工作階段選單中移除「關機」項目"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
-msgstr "是否要顯示確定登出、重新啟動和關機的對話框。"
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr "讓關機按鈕不顯示在工作階段選單內。"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "經典訪客作業階段"
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
+msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "啟動採用經典桌面的訪客作業階段"
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "鎖定螢幕"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "訪客"
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "關機"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "登出"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "重新啟動"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "登出..."
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "系統設定值..."
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "重新啟動..."
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "線上帳號..."
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "關機..."
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
+
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "切換使用者..."
+
+#: ../src/service.c:575 ../src/service.c:591
+#, fuzzy
+msgid "Switch Account"
+msgstr "切換使用者..."
+
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "切換使用者..."
+
+#: ../src/service.c:588
+#, fuzzy
+msgid "Lock/Switch Account"
+msgstr "切換使用者..."
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "訪客作業階段"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "登出..."
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "登出"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "暫停"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "休眠"
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr "重新啟動..."
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
 msgid "Restart"
 msgstr "重新啟動"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr "關機..."
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
 msgstr "關機"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr "您是否真的想關閉所有程式並登出電腦？"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr "有些軟件更新在電腦下次重新啟動前未能套用。"
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "取消"
+
+#: ../src/backend-dbus/actions.c:862
 msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr "您是否真的想關閉所有程式並重新啟動電腦？"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr "您是否真的想關閉所有程式並關掉電腦？"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "登出"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "重新啟動"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "關機"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "登出"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr "重新啟動..."
+#~ msgid "Classic Guest Session"
+#~ msgstr "經典訪客作業階段"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr "關機..."
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "啟動採用經典桌面的訪客作業階段"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "建議重新啟動"
+#~ msgid "Lock Screen"
+#~ msgstr "鎖定螢幕"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "建議重新啟動..."
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "登出"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr "在電腦下次重新啟動之前，有些軟件更新還不會套用"
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "重新啟動"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "取消"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "關機"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "0"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "登出"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr "切換使用者..."
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "重新啟動"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "由 %s 切換..."
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "關機"
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "所有軟件已更新"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "登出"
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "有軟件更新..."
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "重新啟動..."
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "正在安裝更新..."
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "關機..."
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr "重新啟動以完成更新..."
+#~ msgid "Restart Instead"
+#~ msgstr "建議重新啟動"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "系統設定值..."
+#~ msgid "Restart Instead…"
+#~ msgstr "建議重新啟動..."
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "顯示器..."
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr "在電腦下次重新啟動之前，有些軟件更新還不會套用"
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "始動應用程式..."
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "0"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "已連接裝置"
+#~ msgid "Switch From %s…"
+#~ msgstr "由 %s 切換..."
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "打印機"
+#~ msgid "Software Up to Date"
+#~ msgstr "所有軟件已更新"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "掃描器"
+#~ msgid "Updates Available…"
+#~ msgstr "有軟件更新..."
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "網絡攝影機"
+#~ msgid "Updates Installing…"
+#~ msgstr "正在安裝更新..."
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "暫停"
+#~ msgid "Restart to Complete Updates…"
+#~ msgstr "重新啟動以完成更新..."
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "休眠"
+#~ msgid "Displays…"
+#~ msgstr "顯示器..."
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "訪客作業階段"
+#~ msgid "Startup Applications…"
+#~ msgstr "始動應用程式..."
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "訪客"
+#~ msgid "Attached Devices"
+#~ msgstr "已連接裝置"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "線上帳號..."
+#~ msgid "Printers"
+#~ msgstr "打印機"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "使用者帳號..."
+#~ msgid "Scanners"
+#~ msgstr "掃描器"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "%s 網絡攝影機"
+#~ msgid "Webcam"
+#~ msgstr "網絡攝影機"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "掃描器"
+#~ msgid "User Accounts…"
+#~ msgstr "使用者帳號..."
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "%s 掃描器"
+#~ msgid "%s Webcam"
+#~ msgstr "%s 網絡攝影機"
+
+#~ msgid "Scanner"
+#~ msgstr "掃描器"
+
+#~ msgid "%s Scanner"
+#~ msgstr "%s 掃描器"
 
 #~ msgid "Restart..."
 #~ msgstr "重新啟動..."
@@ -293,13 +327,9 @@ msgstr "%s 掃描器"
 #~ msgid "Switch User..."
 #~ msgstr "切換使用者..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr "有些軟件更新在電腦下次重新啟動前未能套用。"
-
 #~ msgid "Restart Instead..."
 #~ msgstr "建議重新啟動..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "從 %s 切換..."
 
@@ -313,7 +343,8 @@ msgstr "%s 掃描器"
 #~ msgid "Shut Down..."
 #~ msgstr "關機..."
 
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "讓重新啟動按鈕不要顯在示作業階段選單內。"
 
 #~ msgid ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index f92aaeb..1eb8250 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"POT-Creation-Date: 2017-07-21 15:42+0200\n"
 "PO-Revision-Date: 2011-09-16 07:55+0000\n"
 "Last-Translator: Roy Chan <roy.chan@linux.org.hk>\n"
 "Language-Team: Chinese (traditional)\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,267 +19,300 @@ msgstr ""
 "X-Generator: Launchpad (build 14041)\n"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:1
-msgid "Makes it so that the logout button doesn’t show in the session menu."
-msgstr "讓登出按鈕不顯示在工作階段選單內。"
+msgid "Suppress the dialog to confirm logout, restart and shutdown action"
+msgstr "停用確認登出、重新啟動和關機動作的對話盒"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:2
-msgid "Makes it so that the restart button doesn’t show in the session menu."
-msgstr "讓登出按鈕不顯示在工作階段選單內。"
-
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid ""
-"Makes it so that the shutdown button doesn’t show in the session menu."
-msgstr "讓關機按鈕不顯示在工作階段選單內。"
+"Whether or not to show confirmation dialogs for logout, restart and shutdown "
+"actions."
+msgstr "是否顯示確認登出、重新啟動和關機動作的對話。"
 
-#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:3
 msgid "Remove the Log Out item from the session menu"
 msgstr "從作業階段選單中移除「登出」項目"
 
+#: ../data/org.ayatana.indicator.session.gschema.xml.in.h:4
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr "讓登出按鈕不顯示在工作階段選單內。"
+
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:5
 msgid "Remove the Restart item from the session menu"
 msgstr "從工作階段選單中移除「重新啟動」項目"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:6
-msgid "Remove the shutdown item from the session menu"
-msgstr "從工作階段選單中移除「關機」項目"
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr "讓登出按鈕不顯示在工作階段選單內。"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:7
-msgid "Suppress the dialog to confirm logout, restart and shutdown action"
-msgstr "停用確認登出、重新啟動和關機動作的對話盒"
+msgid "Remove the shutdown item from the session menu"
+msgstr "從工作階段選單中移除「關機」項目"
 
 #: ../data/org.ayatana.indicator.session.gschema.xml.in.h:8
-msgid ""
-"Whether or not to show confirmation dialogs for logout, restart and shutdown "
-"actions."
-msgstr "是否顯示確認登出、重新啟動和關機動作的對話。"
+msgid "Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr "讓關機按鈕不顯示在工作階段選單內。"
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
-msgid "Classic Guest Session"
-msgstr "經典訪客作業階段"
+#. Translators: the name of the menu ("System"), then the user's name
+#: ../src/service.c:187
+#, c-format
+msgid "System, %s"
+msgstr ""
 
-#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
-msgid "Start a guest session using the classic desktop"
-msgstr "啟動採用舊式經典桌面的訪客作業階段"
+#: ../src/service.c:191
+msgid "System"
+msgstr ""
 
-#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
-#: ../src/device-menu-mgr.c:649
-msgid "Lock Screen"
-msgstr "鎖定螢幕"
+#: ../src/service.c:325
+msgid "Guest"
+msgstr "訪客"
 
-#: ../data/indicator-session-shutdown.desktop.in.in.h:1
-#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
-msgid "Shut Down"
-msgstr "關機"
+#: ../src/service.c:343
+#, c-format
+msgid "%s Desktop Help"
+msgstr ""
 
-#: ../data/indicator-session-logout.desktop.in.in.h:1
-#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
-msgid "Log Out"
-msgstr "登出"
+#: ../src/service.c:344
+#, c-format
+msgid "%s Help"
+msgstr ""
 
-#: ../data/indicator-session-restart.desktop.in.in.h:1
-#: ../src/settings-helper.c:85
-msgid "Restart"
-msgstr "重新啟動"
+#: ../src/service.c:346
+msgid "About This Computer"
+msgstr ""
 
-#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
-msgid "Log Out…"
-msgstr "登出..."
+#: ../src/service.c:361
+msgid "System Settings…"
+msgstr "系統設定值..."
 
-#: ../src/settings-helper.c:89
-msgid "Restart…"
-msgstr "重新啟動..."
+#: ../src/service.c:363
+msgid "Online Accounts…"
+msgstr "線上帳號..."
 
-#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
-msgid "Shut Down…"
-msgstr "關機..."
+#: ../src/service.c:566
+msgid "Start Screen Saver"
+msgstr ""
+
+#: ../src/service.c:574 ../src/service.c:590
+#, fuzzy
+msgid "Switch Account…"
+msgstr "切換使用者帳號..."
+
+#: ../src/service.c:575 ../src/service.c:591
+#, fuzzy
+msgid "Switch Account"
+msgstr "切換使用者帳號..."
+
+#: ../src/service.c:587
+#, fuzzy
+msgid "Lock/Switch Account…"
+msgstr "切換使用者帳號..."
+
+#: ../src/service.c:588
+#, fuzzy
+msgid "Lock/Switch Account"
+msgstr "切換使用者帳號..."
+
+#: ../src/service.c:594
+msgid "Lock"
+msgstr ""
+
+#: ../src/service.c:619
+msgid "Guest Session"
+msgstr "訪客作業階段"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:35
-msgctxt "title"
+#: ../src/service.c:696
+msgid "Log Out…"
+msgstr "登出..."
+
+#: ../src/service.c:696 ../src/backend-dbus/actions.c:824
+#: ../src/backend-dbus/actions.c:826
 msgid "Log Out"
 msgstr "登出"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:36
-msgctxt "title"
+#: ../src/service.c:714
+msgid "Suspend"
+msgstr "暫停"
+
+#: ../src/service.c:717
+msgid "Hibernate"
+msgstr "休眠"
+
+#: ../src/service.c:722
+msgid "Restart…"
+msgstr "重新啟動..."
+
+#: ../src/service.c:722 ../src/backend-dbus/actions.c:861
+#: ../src/backend-dbus/actions.c:863
 msgid "Restart"
 msgstr "重新啟動"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:37
-msgctxt "title"
+#: ../src/service.c:729
+msgid "Shut Down…"
+msgstr "關機..."
+
+#: ../src/service.c:729 ../src/backend-dbus/actions.c:894
+#: ../src/backend-dbus/actions.c:896
 msgid "Shut Down"
 msgstr "關機"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:41
-msgid ""
-"Are you sure you want to close all programs and log out of the computer?"
+#: ../src/backend-dbus/actions.c:818
+#, fuzzy
+msgid "Are you sure you want to close all programs and log out?"
 msgstr "您是否真的想關閉所有程式並從電腦登出？"
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:42
+#: ../src/backend-dbus/actions.c:819
+#, fuzzy
+msgid ""
+"Some software updates won't be applied until the computer next restarts."
+msgstr "有些軟體在電腦下次重新啟動前未能套用更新。"
+
+#: ../src/backend-dbus/actions.c:827 ../src/backend-dbus/actions.c:864
+#: ../src/backend-dbus/actions.c:897
+msgid "Cancel"
+msgstr "取消"
+
+#: ../src/backend-dbus/actions.c:862
 msgid "Are you sure you want to close all programs and restart the computer?"
 msgstr "您是否真的想關閉所有程式並重新啟動電腦？"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:43
-msgid ""
-"Are you sure you want to close all programs and shut down the computer?"
+#: ../src/backend-dbus/actions.c:895
+msgid "Are you sure you want to close all programs and shut down the computer?"
 msgstr "您是否真的想關閉所有程式並關掉電腦？"
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:47
-msgctxt "button"
-msgid "Log Out"
-msgstr "登出"
+#: ../src/backend-dbus/actions.c:1007 ../src/backend-dbus/actions.c:1020
+#: ../src/backend-dbus/actions.c:1035
+msgid "Warning"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:48
-msgctxt "button"
-msgid "Restart"
-msgstr "重新啟動"
+#: ../src/backend-dbus/actions.c:1008
+msgid ""
+"The Ayatana Session Indicator does not support evoking the system\n"
+"settings application for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:49
-msgctxt "button"
-msgid "Shut Down"
-msgstr "關機"
+#: ../src/backend-dbus/actions.c:1021
+msgid ""
+"The Ayatana Session Indicator does not support password changes\n"
+"for your desktop environment, yet.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_LOGOUT,
-#: ../src/dialog.c:55
-msgctxt "button auth"
-msgid "Log Out"
-msgstr "登出"
+#: ../src/backend-dbus/actions.c:1036
+msgid ""
+"The Ayatana Session Indicator does not know yet, how to show\n"
+"information of the currently running desktop environment.\n"
+"\n"
+"Please report this to the developers at:\n"
+"https://github.com/ArcticaProject/ayatana-indicator-session/issues"
+msgstr ""
 
-#. LOGOUT_DIALOG_RESTART,
-#: ../src/dialog.c:56
-msgctxt "button auth"
-msgid "Restart…"
-msgstr "重新啟動..."
+#~ msgid "Classic Guest Session"
+#~ msgstr "經典訪客作業階段"
 
-#. LOGOUT_DIALOG_SHUTDOWN,
-#: ../src/dialog.c:57
-msgctxt "button auth"
-msgid "Shut Down…"
-msgstr "關機..."
+#~ msgid "Start a guest session using the classic desktop"
+#~ msgstr "啟動採用舊式經典桌面的訪客作業階段"
 
-#. TRANSLATORS: This button appears on the logout dialog when
-#. there are updates that require restart.  It will do a restart
-#. in place of a log out.
-#: ../src/dialog.c:63
-msgid "Restart Instead"
-msgstr "建議重新啟動"
+#~ msgid "Lock Screen"
+#~ msgstr "鎖定螢幕"
 
-#: ../src/dialog.c:64
-msgid "Restart Instead…"
-msgstr "建議重新啟動..."
+#~ msgctxt "title"
+#~ msgid "Log Out"
+#~ msgstr "登出"
 
-#: ../src/dialog.c:65
-msgid "Some software updates won’t apply until the computer next restarts."
-msgstr "在電腦下次重新啟動之前，有些軟體更新還不會套用"
+#~ msgctxt "title"
+#~ msgid "Restart"
+#~ msgstr "重新啟動"
 
-#: ../src/dialog.c:219 ../src/dialog.c:224
-msgid "Cancel"
-msgstr "取消"
+#~ msgctxt "title"
+#~ msgid "Shut Down"
+#~ msgstr "關機"
 
-#: ../src/indicator-session.c:538
-msgctxt "session_menu:switchfrom"
-msgid "1"
-msgstr "0"
+#~ msgctxt "button"
+#~ msgid "Log Out"
+#~ msgstr "登出"
 
-#: ../src/indicator-session.c:551
-msgid "Switch User Account…"
-msgstr "切換使用者帳號..."
+#~ msgctxt "button"
+#~ msgid "Restart"
+#~ msgstr "重新啟動"
 
-#: ../src/indicator-session.c:578
-#, c-format
-msgid "Switch From %s…"
-msgstr "自 %s 切換..."
+#~ msgctxt "button"
+#~ msgid "Shut Down"
+#~ msgstr "關機"
 
-#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
-#: ../src/device-menu-mgr.c:548
-msgid "Software Up to Date"
-msgstr "軟體皆為最新狀態"
+#~ msgctxt "button auth"
+#~ msgid "Log Out"
+#~ msgstr "登出"
 
-#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
-msgid "Updates Available…"
-msgstr "有可用的更新..."
+#~ msgctxt "button auth"
+#~ msgid "Restart…"
+#~ msgstr "重新啟動..."
 
-#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
-msgid "Updates Installing…"
-msgstr "正在安裝更新..."
+#~ msgctxt "button auth"
+#~ msgid "Shut Down…"
+#~ msgstr "關機..."
 
-#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
-msgid "Restart to Complete Updates…"
-msgstr "重新啟動以完成更新..."
+#~ msgid "Restart Instead"
+#~ msgstr "建議重新啟動"
 
-#: ../src/device-menu-mgr.c:516
-msgid "System Settings…"
-msgstr "系統設定值..."
+#~ msgid "Restart Instead…"
+#~ msgstr "建議重新啟動..."
 
-#: ../src/device-menu-mgr.c:527
-msgid "Displays…"
-msgstr "顯示器..."
+#~ msgid "Some software updates won’t apply until the computer next restarts."
+#~ msgstr "在電腦下次重新啟動之前，有些軟體更新還不會套用"
 
-#: ../src/device-menu-mgr.c:537
-msgid "Startup Applications…"
-msgstr "始動應用程式..."
+#~ msgctxt "session_menu:switchfrom"
+#~ msgid "1"
+#~ msgstr "0"
 
-#: ../src/device-menu-mgr.c:566
-msgid "Attached Devices"
-msgstr "已連接裝置"
+#~ msgid "Switch From %s…"
+#~ msgstr "自 %s 切換..."
 
-#: ../src/device-menu-mgr.c:577
-msgid "Printers"
-msgstr "印表機"
+#~ msgid "Software Up to Date"
+#~ msgstr "軟體皆為最新狀態"
 
-#: ../src/device-menu-mgr.c:588
-msgid "Scanners"
-msgstr "掃描器"
+#~ msgid "Updates Available…"
+#~ msgstr "有可用的更新..."
 
-#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
-msgid "Webcam"
-msgstr "網路攝影機"
+#~ msgid "Updates Installing…"
+#~ msgstr "正在安裝更新..."
 
-#: ../src/device-menu-mgr.c:692
-msgid "Suspend"
-msgstr "暫停"
+#~ msgid "Restart to Complete Updates…"
+#~ msgstr "重新啟動以完成更新..."
 
-#: ../src/device-menu-mgr.c:704
-msgid "Hibernate"
-msgstr "休眠"
+#~ msgid "Displays…"
+#~ msgstr "顯示器..."
 
-#: ../src/user-menu-mgr.c:175
-msgid "Guest Session"
-msgstr "訪客作業階段"
+#~ msgid "Startup Applications…"
+#~ msgstr "始動應用程式..."
 
-#: ../src/user-menu-mgr.c:189
-msgid "Guest"
-msgstr "訪客"
+#~ msgid "Attached Devices"
+#~ msgstr "已連接裝置"
 
-#: ../src/user-menu-mgr.c:270
-msgid "Online Accounts…"
-msgstr "線上帳號..."
+#~ msgid "Printers"
+#~ msgstr "印表機"
 
-#: ../src/user-menu-mgr.c:285
-msgid "User Accounts…"
-msgstr "使用者帳號..."
+#~ msgid "Scanners"
+#~ msgstr "掃描器"
 
-#: ../src/udev-mgr.c:255
-#, c-format
-msgid "%s Webcam"
-msgstr "%s 網路攝影機"
+#~ msgid "Webcam"
+#~ msgstr "網路攝影機"
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
-#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
-msgid "Scanner"
-msgstr "掃描器"
+#~ msgid "User Accounts…"
+#~ msgstr "使用者帳號..."
 
-#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
-#, c-format
-msgid "%s Scanner"
-msgstr "%s 掃描器"
+#~ msgid "%s Webcam"
+#~ msgstr "%s 網路攝影機"
+
+#~ msgid "Scanner"
+#~ msgstr "掃描器"
+
+#~ msgid "%s Scanner"
+#~ msgstr "%s 掃描器"
 
 #~ msgid "Restart..."
 #~ msgstr "重新啟動..."
@@ -299,7 +333,6 @@ msgstr "%s 掃描器"
 #~ msgid "Restart Instead..."
 #~ msgstr "建議重新啟動..."
 
-#, c-format
 #~ msgid "Switch From %s..."
 #~ msgstr "從 %s 切換..."
 
@@ -307,10 +340,8 @@ msgstr "%s 掃描器"
 #~ msgid "Shut Down..."
 #~ msgstr "關機..."
 
-#~ msgid "Some software updates won't apply until the computer next restarts."
-#~ msgstr "有些軟體在電腦下次重新啟動前未能套用更新。"
-
-#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgid ""
+#~ "Makes it so that the restart button doesn't show in the session menu."
 #~ msgstr "讓重新啟動按鈕不要顯在示作業階段選單內。"
 
 #~ msgid ""