diff --git a/po/sk.po b/po/sk.po
index dfd4b9fd8d7441254aaa0fcc49033d84fe80aa4a..df392d310b38b6f36f03672d67d994a1f4d1f84e 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -3,14 +3,20 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
+# Translators:
+# Xfce Bot <transifex@xfce.org>, 2018
+# Slavko <linux@slavino.sk>, 2018
+# Nick Schermer <nick@xfce.org>, 2018
+# Dušan Kazik <prescott66@gmail.com>, 2018
+# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-16 18:31+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Xfce Bot <transifex@xfce.org>, 2018\n"
+"POT-Creation-Date: 2018-10-31 06:31+0100\n"
+"PO-Revision-Date: 2018-10-16 16:27+0000\n"
+"Last-Translator: Dušan Kazik <prescott66@gmail.com>, 2018\n"
 "Language-Team: Slovak (https://www.transifex.com/xfce/teams/16840/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,46 +24,6 @@ msgstr ""
 "Language: sk\n"
 "Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
 
-#: ../data/lock-dialog-default.ui.h:2
-#, no-c-format
-msgid "%U"
-msgstr "%U"
-
-#: ../data/lock-dialog-default.ui.h:3
-msgid "Enter your password"
-msgstr "Zdajte svoje heslo"
-
-#: ../data/lock-dialog-default.ui.h:4
-msgid "You have the Caps Lock key on."
-msgstr "Máte zapnutý Caps Lock."
-
-#: ../data/lock-dialog-default.ui.h:5
-msgid "_Switch User"
-msgstr "P_repnúť používatveľa"
-
-#: ../data/lock-dialog-default.ui.h:6
-msgid "_Log Out"
-msgstr "Odh_lásiť"
-
-#: ../data/lock-dialog-default.ui.h:7 ../src/copy-theme-dialog.c:263
-#: ../src/gs-lock-plug.c:1323
-msgid "_Cancel"
-msgstr "_Zrušiť"
-
-#: ../data/lock-dialog-default.ui.h:8 ../src/gs-lock-plug.c:1328
-msgid "_Unlock"
-msgstr "_Odomknúť"
-
-#: ../data/lock-dialog-default.ui.h:10
-#, no-c-format
-msgid "<b>%h</b>"
-msgstr "<b>%h</b>"
-
-#: ../data/lock-dialog-default.ui.h:12
-#, no-c-format
-msgid "<b>%s</b>"
-msgstr "<b>%s</b>"
-
 #: ../data/xfce4-screensaver-preferences.desktop.in.h:1
 #: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
@@ -67,50 +33,6 @@ msgstr "Šetrič obrazovky"
 msgid "Set your screensaver preferences"
 msgstr "Vaše nastavenia šetriča obrazovky"
 
-#: ../data/xfce4-screensaver-preferences.ui.h:1
-msgid "Screensaver Preview"
-msgstr "Ukážka šetriča obrazovky"
-
-#: ../data/xfce4-screensaver-preferences.ui.h:2
-msgid "<b>Screensaver preview</b>"
-msgstr "<b>Ukážka šetrič obrazovky</b>"
-
-#: ../data/xfce4-screensaver-preferences.ui.h:3
-msgid "Screensaver Preferences"
-msgstr "Nastavenia šetriča obrazovky"
-
-#: ../data/xfce4-screensaver-preferences.ui.h:4
-msgid "Configure your screensaver and locker"
-msgstr "Nastavte svoj šetrič obrazovky a zamykanie"
-
-#: ../data/xfce4-screensaver-preferences.ui.h:5
-msgid "Power _Management"
-msgstr "Správa _napájania"
-
-#: ../data/xfce4-screensaver-preferences.ui.h:6
-msgid "_Preview"
-msgstr "_Náhľad"
-
-#: ../data/xfce4-screensaver-preferences.ui.h:7
-msgid "_Screensaver theme:"
-msgstr "_Téma šetriča obrazovky:"
-
-#: ../data/xfce4-screensaver-preferences.ui.h:8
-msgid "Regard the computer as _idle after:"
-msgstr "Počítač považovať za neč_inný po:"
-
-#: ../data/xfce4-screensaver-preferences.ui.h:9
-msgid "_Activate screensaver when computer is idle"
-msgstr "_Aktivovať šetrič obrazovky keď je počítač nečinný"
-
-#: ../data/xfce4-screensaver-preferences.ui.h:10
-msgid "_Lock screen when screensaver is active"
-msgstr "_Zamknúť obrazovku, keď je šetrič aktívny"
-
-#: ../data/xfce4-screensaver-preferences.ui.h:11
-msgid "<b>Warning: the screen will not be locked for the root user.</b>"
-msgstr "<b>Upozornenie: obrazovka nebude zamknutá pri používateľovi root.</b>"
-
 #: ../data/xfce4-screensaver.directory.in.h:1
 msgid "Screensavers"
 msgstr "Šetriče obrazovky"
@@ -227,6 +149,11 @@ msgstr "Z:"
 msgid "To:"
 msgstr "Do:"
 
+#: ../src/copy-theme-dialog.c:263 ../src/gs-lock-plug.c:1325
+#: ../src/xfce4-screensaver-dialog.ui.h:7
+msgid "_Cancel"
+msgstr "_Zrušiť"
+
 #: ../src/copy-theme-dialog.c:266
 msgid "Copying themes"
 msgstr "Kopírovanie tém"
@@ -263,7 +190,7 @@ msgstr "Nemožno nastaviť PAM_TTY=%s"
 msgid "Incorrect password."
 msgstr "Neplatné heslo."
 
-#: ../src/gs-auth-pam.c:484 ../src/xfce4-screensaver-dialog.c:314
+#: ../src/gs-auth-pam.c:484 ../src/xfce4-screensaver-dialog.c:315
 msgid "Authentication failed."
 msgstr "Overenie zlyhalo."
 
@@ -291,28 +218,32 @@ msgstr ""
 msgid "screensaver already running in this session"
 msgstr "šetrič obrazovky je už v tejto relácii spustený"
 
-#: ../src/gs-lock-plug.c:291
+#: ../src/gs-lock-plug.c:293
 msgid "%A, %B %e   %H:%M"
 msgstr "%A, %B %e   %H:%M"
 
-#: ../src/gs-lock-plug.c:386
+#: ../src/gs-lock-plug.c:388
 msgid "Time has expired."
 msgstr "Čas vypršal."
 
-#: ../src/gs-lock-plug.c:1308
+#: ../src/gs-lock-plug.c:1310
 msgid "S_witch User..."
 msgstr "_Prepnúť používateľa…"
 
-#: ../src/gs-lock-plug.c:1317
+#: ../src/gs-lock-plug.c:1319
 msgid "Log _Out"
 msgstr "_Odhlásiť"
 
+#: ../src/gs-lock-plug.c:1330 ../src/xfce4-screensaver-dialog.ui.h:8
+msgid "_Unlock"
+msgstr "_Odomknúť"
+
 #. To translators: This expands to USERNAME on HOSTNAME
-#: ../src/gs-lock-plug.c:1513
+#: ../src/gs-lock-plug.c:1515
 msgid "%U on %h"
 msgstr "%U na %h"
 
-#: ../src/gs-lock-plug.c:1528
+#: ../src/gs-lock-plug.c:1530
 msgid "Please enter your password."
 msgstr "Prosím, zadajte svoje heslo."
 
@@ -393,7 +324,7 @@ msgstr ""
 msgid "The reason for inhibiting the screensaver"
 msgstr ""
 
-#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:64
+#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:65
 #: ../src/xfce4-screensaver.c:59
 msgid "Version of this application"
 msgstr ""
@@ -429,124 +360,163 @@ msgstr ""
 #: ../src/xfce4-screensaver-command.c:417
 #, c-format
 msgid "The screensaver is not currently active.\n"
-msgstr ""
+msgstr "Šetrič obrazovky momentálne nie je aktívny.\n"
 
-#: ../src/xfce4-screensaver-dialog.c:63
+#: ../src/xfce4-screensaver-dialog.c:64
 msgid "Show debugging output"
 msgstr "Zobraziť ladiaci výstup"
 
-#: ../src/xfce4-screensaver-dialog.c:65
+#: ../src/xfce4-screensaver-dialog.c:66
 msgid "Show the logout button"
 msgstr "Zobraziť tlačidlo odhlásenia"
 
-#: ../src/xfce4-screensaver-dialog.c:66
+#: ../src/xfce4-screensaver-dialog.c:67
 msgid "Command to invoke from the logout button"
 msgstr "Príkaz spustený tlačidlom odhlásenia"
 
-#: ../src/xfce4-screensaver-dialog.c:67
+#: ../src/xfce4-screensaver-dialog.c:68
 msgid "Show the switch user button"
 msgstr "Zobraziť tlačidlo prepnutia používateľa"
 
-#: ../src/xfce4-screensaver-dialog.c:68
+#: ../src/xfce4-screensaver-dialog.c:69
 msgid "Message to show in the dialog"
 msgstr "Správa zobrazená v dialógu"
 
-#: ../src/xfce4-screensaver-dialog.c:68 ../src/xfce4-screensaver-dialog.c:69
+#: ../src/xfce4-screensaver-dialog.c:69 ../src/xfce4-screensaver-dialog.c:70
 msgid "MESSAGE"
 msgstr "SPRÁVA"
 
-#: ../src/xfce4-screensaver-dialog.c:69
+#: ../src/xfce4-screensaver-dialog.c:70
 msgid "Not used"
 msgstr "Nepoužité"
 
-#: ../src/xfce4-screensaver-dialog.c:70
+#: ../src/xfce4-screensaver-dialog.c:71
 msgid "Monitor height"
 msgstr "Výška monitora"
 
-#: ../src/xfce4-screensaver-dialog.c:71
+#: ../src/xfce4-screensaver-dialog.c:72
 msgid "Monitor width"
 msgstr "Šírka monitora"
 
-#: ../src/xfce4-screensaver-dialog.c:72
+#: ../src/xfce4-screensaver-dialog.c:73
 msgid "Monitor index"
 msgstr "Číslo monitora"
 
 #. login: is whacked always translate to Username:
-#: ../src/xfce4-screensaver-dialog.c:176 ../src/xfce4-screensaver-dialog.c:177
-#: ../src/xfce4-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:177 ../src/xfce4-screensaver-dialog.c:178
+#: ../src/xfce4-screensaver-dialog.c:179
 msgid "Please enter your username."
 msgstr "Prosím, zadajte prihlasovacie meno."
 
-#: ../src/xfce4-screensaver-dialog.c:181
+#: ../src/xfce4-screensaver-dialog.c:182
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Musíte bezodkladne zmeniť svoje heslo (heslo zastaralo)"
 
-#: ../src/xfce4-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:183
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Musíte bezodkladne zmeniť svoje heslo (vynútené od root)"
 
-#: ../src/xfce4-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:184
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Váš účet vypršal, prosím kontaktujte správcu svojho systému"
 
-#: ../src/xfce4-screensaver-dialog.c:184
+#: ../src/xfce4-screensaver-dialog.c:185
 msgid "No password supplied."
 msgstr "Nebolo zadané heslo."
 
-#: ../src/xfce4-screensaver-dialog.c:185
+#: ../src/xfce4-screensaver-dialog.c:186
 msgid "Password unchanged."
 msgstr "Heslo nebolo zmenené."
 
-#: ../src/xfce4-screensaver-dialog.c:186
+#: ../src/xfce4-screensaver-dialog.c:187
 msgid "Can not get username."
 msgstr "Nemožno získať meno používateľa."
 
-#: ../src/xfce4-screensaver-dialog.c:187
+#: ../src/xfce4-screensaver-dialog.c:188
 msgid "Retype your new password."
 msgstr "Zdajte svoje heslo znova."
 
-#: ../src/xfce4-screensaver-dialog.c:188
+#: ../src/xfce4-screensaver-dialog.c:189
 msgid "Enter your new password."
 msgstr "Zadajte svoje nové heslo."
 
-#: ../src/xfce4-screensaver-dialog.c:189
+#: ../src/xfce4-screensaver-dialog.c:190
 msgid "Enter your current password:"
 msgstr "Zadajte svoje aktuálne heslo."
 
-#: ../src/xfce4-screensaver-dialog.c:190
+#: ../src/xfce4-screensaver-dialog.c:191
 msgid "Error while changing NIS password."
 msgstr "Chyba pri zmene hesla NIS."
 
-#: ../src/xfce4-screensaver-dialog.c:191
+#: ../src/xfce4-screensaver-dialog.c:192
 msgid "You must choose a longer password."
 msgstr "Musíte zvoliť dlhšie heslo."
 
-#: ../src/xfce4-screensaver-dialog.c:192
+#: ../src/xfce4-screensaver-dialog.c:193
 msgid "Password has been already used. Choose another."
 msgstr "Heslo už bolo použité, zvoľte iné."
 
-#: ../src/xfce4-screensaver-dialog.c:193
+#: ../src/xfce4-screensaver-dialog.c:194
 msgid "You must wait longer to change your password."
 msgstr "Musíte počkať dlhšie, kým môžete zmeniť svoje heslo."
 
-#: ../src/xfce4-screensaver-dialog.c:194
+#: ../src/xfce4-screensaver-dialog.c:195
 msgid "Sorry, passwords do not match."
 msgstr "Prepáčte, heslá sa nezhodujú."
 
-#: ../src/xfce4-screensaver-dialog.c:268
+#: ../src/xfce4-screensaver-dialog.c:269
 msgid "Checking..."
 msgstr "Kontrolovanie…"
 
-#: ../src/xfce4-screensaver-preferences.c:443
+#: ../src/xfce4-screensaver-dialog.ui.h:2
+#, no-c-format
+msgid "%U"
+msgstr "%U"
+
+#: ../src/xfce4-screensaver-dialog.ui.h:3
+msgid "Enter your password"
+msgstr "Zdajte svoje heslo"
+
+#: ../src/xfce4-screensaver-dialog.ui.h:4
+msgid "You have the Caps Lock key on."
+msgstr "Máte zapnutý Caps Lock."
+
+#: ../src/xfce4-screensaver-dialog.ui.h:5
+msgid "_Switch User"
+msgstr "P_repnúť používatveľa"
+
+#: ../src/xfce4-screensaver-dialog.ui.h:6
+msgid "_Log Out"
+msgstr "Odh_lásiť"
+
+#: ../src/xfce4-screensaver-dialog.ui.h:10
+#, no-c-format
+msgid "<b>%h</b>"
+msgstr "<b>%h</b>"
+
+#: ../src/xfce4-screensaver-dialog.ui.h:12
+#, no-c-format
+msgid "<b>%s</b>"
+msgstr "<b>%s</b>"
+
+#: ../src/xfce4-screensaver-preferences.c:86
+msgid "Settings manager socket"
+msgstr "Soket správcu nastavení"
+
+#: ../src/xfce4-screensaver-preferences.c:86
+msgid "SOCKET ID"
+msgstr ""
+
+#: ../src/xfce4-screensaver-preferences.c:451
 msgid "Blank screen"
 msgstr "Prázdna obrazovka"
 
-#: ../src/xfce4-screensaver-preferences.c:449
+#: ../src/xfce4-screensaver-preferences.c:457
 msgid "Random"
 msgstr "Náhodne"
 
-#: ../src/xfce4-screensaver-preferences.c:935
-#: ../src/xfce4-screensaver-preferences.c:945
+#: ../src/xfce4-screensaver-preferences.c:943
+#: ../src/xfce4-screensaver-preferences.c:953
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -555,14 +525,14 @@ msgstr[1] "%d hodiny"
 msgstr[2] "%d hodín"
 msgstr[3] "%d hodín"
 
-#: ../src/xfce4-screensaver-preferences.c:938
-#: ../src/xfce4-screensaver-preferences.c:947
-#: ../src/xfce4-screensaver-preferences.c:956
-#: ../src/xfce4-screensaver-preferences.c:959
+#: ../src/xfce4-screensaver-preferences.c:946
+#: ../src/xfce4-screensaver-preferences.c:955
 #: ../src/xfce4-screensaver-preferences.c:964
 #: ../src/xfce4-screensaver-preferences.c:967
 #: ../src/xfce4-screensaver-preferences.c:972
 #: ../src/xfce4-screensaver-preferences.c:975
+#: ../src/xfce4-screensaver-preferences.c:980
+#: ../src/xfce4-screensaver-preferences.c:983
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -571,7 +541,7 @@ msgstr[1] "%d minúty"
 msgstr[2] "%d minút"
 msgstr[3] "%d minút"
 
-#: ../src/xfce4-screensaver-preferences.c:941
+#: ../src/xfce4-screensaver-preferences.c:949
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -582,15 +552,15 @@ msgstr[3] "%d sekúnd"
 
 #. hour:minutes
 #. minutes:seconds
-#: ../src/xfce4-screensaver-preferences.c:944
-#: ../src/xfce4-screensaver-preferences.c:991
-#: ../src/xfce4-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:952
+#: ../src/xfce4-screensaver-preferences.c:999
+#: ../src/xfce4-screensaver-preferences.c:1012
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. hour:minutes:seconds
-#: ../src/xfce4-screensaver-preferences.c:986
+#: ../src/xfce4-screensaver-preferences.c:994
 #, c-format
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -598,26 +568,86 @@ msgstr "%s %s %s"
 #. hour
 #. minutes
 #. seconds
-#: ../src/xfce4-screensaver-preferences.c:996
-#: ../src/xfce4-screensaver-preferences.c:1009
-#: ../src/xfce4-screensaver-preferences.c:1045
+#: ../src/xfce4-screensaver-preferences.c:1004
+#: ../src/xfce4-screensaver-preferences.c:1017
+#: ../src/xfce4-screensaver-preferences.c:1053
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/xfce4-screensaver-preferences.c:1060
+#: ../src/xfce4-screensaver-preferences.c:1068
 #, c-format
 msgid "Never"
 msgstr "Nikdy"
 
-#: ../src/xfce4-screensaver-preferences.c:1511
+#: ../src/xfce4-screensaver-preferences.c:1566
 msgid "Could not load the main interface"
 msgstr "Nemožno načítať hlavné rozhranie"
 
-#: ../src/xfce4-screensaver-preferences.c:1513
+#: ../src/xfce4-screensaver-preferences.c:1568
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Prosím, overte, že je šetrič obrazovky správne nainštalovaný"
 
+#: ../src/xfce4-screensaver-preferences.ui.h:1
+msgid "Screensaver Preview"
+msgstr "Ukážka šetriča obrazovky"
+
+#: ../src/xfce4-screensaver-preferences.ui.h:2
+msgid "<b>Screensaver preview</b>"
+msgstr "<b>Ukážka šetrič obrazovky</b>"
+
+#: ../src/xfce4-screensaver-preferences.ui.h:3
+msgid "Screensaver Preferences"
+msgstr "Nastavenia šetriča obrazovky"
+
+#: ../src/xfce4-screensaver-preferences.ui.h:4
+msgid "Configure your screensaver and locker"
+msgstr "Nastavte svoj šetrič obrazovky a zamykanie"
+
+#: ../src/xfce4-screensaver-preferences.ui.h:5
+msgid "Power _Management"
+msgstr "Správa _napájania"
+
+#: ../src/xfce4-screensaver-preferences.ui.h:6
+msgid "_Preview"
+msgstr "_Náhľad"
+
+#: ../src/xfce4-screensaver-preferences.ui.h:7
+msgid "Running as root"
+msgstr ""
+
+#: ../src/xfce4-screensaver-preferences.ui.h:8
+msgid "The screen will not be locked for the root user."
+msgstr ""
+
+#: ../src/xfce4-screensaver-preferences.ui.h:9
+msgid "Resolve"
+msgstr ""
+
+#: ../src/xfce4-screensaver-preferences.ui.h:10
+msgid "Xfce Power Manager is not configured to handle laptop lid events"
+msgstr ""
+
+#: ../src/xfce4-screensaver-preferences.ui.h:11
+msgid "Your computer may not be locked when you close the lid."
+msgstr ""
+
+#: ../src/xfce4-screensaver-preferences.ui.h:12
+msgid "_Screensaver theme:"
+msgstr "_Téma šetriča obrazovky:"
+
+#: ../src/xfce4-screensaver-preferences.ui.h:13
+msgid "Regard the computer as _idle after:"
+msgstr "Počítač považovať za neč_inný po:"
+
+#: ../src/xfce4-screensaver-preferences.ui.h:14
+msgid "_Activate screensaver when computer is idle"
+msgstr "_Aktivovať šetrič obrazovky keď je počítač nečinný"
+
+#: ../src/xfce4-screensaver-preferences.ui.h:15
+msgid "_Lock screen when screensaver is active"
+msgstr "_Zamknúť obrazovku, keď je šetrič aktívny"
+
 #: ../src/xfce4-screensaver.c:60
 msgid "Don't become a daemon"
 msgstr "Nebude démonom"