diff --git a/po/ms.po b/po/ms.po
index 53df60417fc3670dc70c5b21b562f700c49ca1bb..6ea5ed1c8519471fd8bf7986272d166b4bd8002c 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -4,16 +4,16 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# abuyop <abuyop@gmail.com>, 2018
+# abuyop <abuyop@gmail.com>, 2019
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-31 06:31+0100\n"
+"POT-Creation-Date: 2018-11-20 06:31+0100\n"
 "PO-Revision-Date: 2018-10-16 16:27+0000\n"
-"Last-Translator: abuyop <abuyop@gmail.com>, 2018\n"
+"Last-Translator: abuyop <abuyop@gmail.com>, 2019\n"
 "Language-Team: Malay (https://www.transifex.com/xfce/teams/16840/ms/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,6 +22,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/xfce4-screensaver-preferences.desktop.in.h:1
+#: ../src/xfce4-screensaver-preferences.ui.h:18
 #: ../src/xfce4-screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Penyelamat Skrin"
@@ -38,54 +39,78 @@ msgstr "Penyelamat Skrin"
 msgid "Screensaver themes"
 msgstr "Tema penyelamat skrin"
 
-#: ../savers/floaters.c:91
+#: ../savers/floaters.c:89
 msgid "Show paths that images follow"
 msgstr "Tunjuk laluan bagi imej berikut"
 
-#: ../savers/floaters.c:96
+#: ../savers/floaters.c:94
 msgid "Occasionally rotate images as they move"
 msgstr "Putar imej sekali-sekala pabila ia bergerak"
 
-#: ../savers/floaters.c:101
+#: ../savers/floaters.c:99
 msgid "Print out frame rate and other statistics"
 msgstr "Papar kadar bingkai dan lain-lain statistik"
 
-#: ../savers/floaters.c:106
+#: ../savers/floaters.c:104
 msgid "The maximum number of images to keep on screen"
 msgstr "Bilangan imej maksimum yang dipapar pada skrin"
 
-#: ../savers/floaters.c:106
+#: ../savers/floaters.c:104
 msgid "MAX_IMAGES"
 msgstr "MAX_IMAGES"
 
-#: ../savers/floaters.c:111
+#: ../savers/floaters.c:109
 msgid "The initial size and position of window"
 msgstr "Saiz dan kedudukan tetingkap awal"
 
-#: ../savers/floaters.c:111
+#: ../savers/floaters.c:109
 msgid "WIDTHxHEIGHT+X+Y"
 msgstr "WIDTHxHEIGHT+X+Y"
 
-#: ../savers/floaters.c:116
+#: ../savers/floaters.c:114
 msgid "The source image to use"
 msgstr "Imej sumber yang digunakan"
 
 #. translators: the word "image" here
 #. * represents a command line argument
-#: ../savers/floaters.c:1186
+#: ../savers/floaters.c:1120
 msgid "image - floats images around the screen"
 msgstr "imej - imej terapung-apung di dalam skrin"
 
-#: ../savers/floaters.c:1192 ../savers/popsquares.c:50
+#: ../savers/floaters.c:1124 ../savers/popsquares.c:49
 #, c-format
 msgid "%s. See --help for usage information.\n"
 msgstr "%s. Taip --help untuk maklumat penggunaan.\n"
 
-#: ../savers/floaters.c:1201
+#: ../savers/floaters.c:1132
 #, c-format
 msgid "You must specify one image.  See --help for usage information.\n"
 msgstr "Anda mesti nyatakan satu imej. Taip --help untuk maklumat penggunaan.\n"
 
+#: ../savers/slideshow.c:53
+msgid "Location to get images from"
+msgstr "Lokasi untuk mendapatkan imej"
+
+#: ../savers/slideshow.c:53
+msgid "PATH"
+msgstr "LALUAN"
+
+#: ../savers/slideshow.c:57
+msgid "Color to use for images background"
+msgstr "Warna yang digunakan untuk latar belakang imej"
+
+#: ../savers/slideshow.c:57
+msgid "\"#rrggbb\""
+msgstr "\"#rrggbb\""
+
+#: ../savers/slideshow.c:61
+msgid "Do not randomize pictures from location"
+msgstr "Jangan rawakkan gambar dalam lokasi"
+
+#: ../savers/slideshow.c:65
+msgid "Do not try to stretch images on screen"
+msgstr "Jangan cuba regangkan imej di atas skrin"
+
 #: ../savers/xfce-floaters.desktop.in.in.h:1
 msgid "Floating Xfce"
 msgstr "Xfce terapung"
@@ -94,224 +119,201 @@ msgstr "Xfce terapung"
 msgid "Bubbles the Xfce logo around the screen"
 msgstr "Buih-buih berlogo Xfce terapung di dalam skrin"
 
-#: ../savers/personal-slideshow.desktop.in.in.h:1
+#: ../savers/xfce-personal-slideshow.desktop.in.in.h:1
 msgid "Pictures folder"
 msgstr "Folder gambar"
 
-#: ../savers/personal-slideshow.desktop.in.in.h:2
+#: ../savers/xfce-personal-slideshow.desktop.in.in.h:2
 msgid "Display a slideshow from your Pictures folder"
 msgstr "Papar papan slaid dalam folder Gambar anda"
 
-#: ../savers/popsquares.desktop.in.in.h:1
+#: ../savers/xfce-popsquares.desktop.in.in.h:1
 msgid "Pop art squares"
 msgstr "Petak seni pop"
 
-#: ../savers/popsquares.desktop.in.in.h:2
+#: ../savers/xfce-popsquares.desktop.in.in.h:2
 msgid "A pop-art-ish grid of pulsing colors."
 msgstr "Grid seni pop yang warna berdenyut-denyut bertukar."
 
-#: ../savers/slideshow.c:55
-msgid "Location to get images from"
-msgstr "Lokasi untuk mendapatkan imej"
-
-#: ../savers/slideshow.c:55
-msgid "PATH"
-msgstr "LALUAN"
-
-#: ../savers/slideshow.c:59
-msgid "Color to use for images background"
-msgstr "Warna yang digunakan untuk latar belakang imej"
-
-#: ../savers/slideshow.c:59
-msgid "\"#rrggbb\""
-msgstr "\"#rrggbb\""
-
-#: ../savers/slideshow.c:63
-msgid "Do not randomize pictures from location"
-msgstr "Jangan rawakkan gambar dalam lokasi"
-
-#: ../savers/slideshow.c:67
-msgid "Do not try to stretch images on screen"
-msgstr "Jangan cuba regangkan imej di atas skrin"
-
-#: ../src/copy-theme-dialog.c:222
+#: ../src/copy-theme-dialog.c:214
 msgid "Copying files"
 msgstr "Menyalin fail"
 
-#: ../src/copy-theme-dialog.c:241
+#: ../src/copy-theme-dialog.c:233
 msgid "From:"
 msgstr "Dari:"
 
-#: ../src/copy-theme-dialog.c:245
+#: ../src/copy-theme-dialog.c:237
 msgid "To:"
 msgstr "Ke:"
 
-#: ../src/copy-theme-dialog.c:263 ../src/gs-lock-plug.c:1325
+#: ../src/copy-theme-dialog.c:255 ../src/gs-lock-plug.c:1195
 #: ../src/xfce4-screensaver-dialog.ui.h:7
 msgid "_Cancel"
 msgstr "_Batal"
 
-#: ../src/copy-theme-dialog.c:266
+#: ../src/copy-theme-dialog.c:258
 msgid "Copying themes"
 msgstr "Menyalin tema"
 
-#: ../src/copy-theme-dialog.c:310
+#: ../src/copy-theme-dialog.c:296
 msgid "Invalid screensaver theme"
 msgstr "Tema penyelamat skrin tidak sah"
 
-#: ../src/copy-theme-dialog.c:313
+#: ../src/copy-theme-dialog.c:299
 #, c-format
 msgid "%s does not appear to be a valid screensaver theme."
 msgstr "%s tidak kelihatan tema penyelamat skrin yang sah."
 
-#: ../src/copy-theme-dialog.c:494
+#: ../src/copy-theme-dialog.c:457
 #, c-format
 msgid "Copying file: %u of %u"
 msgstr "Menyalin fail: %u dari %u"
 
-#: ../src/gs-auth-pam.c:172
+#: ../src/gs-auth-pam.c:163
 msgid "Password:"
 msgstr "Kata Laluan:"
 
-#: ../src/gs-auth-pam.c:414
+#: ../src/gs-auth-pam.c:378
 #, c-format
 msgid "Unable to establish service %s: %s\n"
 msgstr "Tidak dapat menubuhkan perkhidmatan %s: %s\n"
 
-#: ../src/gs-auth-pam.c:444
+#: ../src/gs-auth-pam.c:404
 #, c-format
 msgid "Can't set PAM_TTY=%s"
 msgstr "Tidak dapat tetapkan PAM_TTY=%s"
 
-#: ../src/gs-auth-pam.c:480
+#: ../src/gs-auth-pam.c:435
 msgid "Incorrect password."
 msgstr "Kata laluan salah."
 
-#: ../src/gs-auth-pam.c:484 ../src/xfce4-screensaver-dialog.c:315
+#: ../src/gs-auth-pam.c:437 ../src/xfce4-screensaver-dialog.c:313
 msgid "Authentication failed."
 msgstr "Pengesahihan gagal."
 
-#: ../src/gs-auth-pam.c:500
+#: ../src/gs-auth-pam.c:451
 msgid "Not permitted to gain access at this time."
 msgstr "Tidak dibenarkan mendapat capaian buat masa ini."
 
-#: ../src/gs-auth-pam.c:508
+#: ../src/gs-auth-pam.c:457
 msgid "No longer permitted to access the system."
 msgstr "Tidak lagi dibenarkan mencapai sistem."
 
-#: ../src/gs-auth-pam.c:746
+#: ../src/gs-auth-pam.c:674
 msgid "Username:"
 msgstr "Nama pengguna:"
 
-#: ../src/gs-listener-dbus.c:2176
+#: ../src/gs-listener-dbus.c:1950
 msgid "failed to register with the message bus"
 msgstr "gagal berdaftar dengan bas mesej"
 
-#: ../src/gs-listener-dbus.c:2187
+#: ../src/gs-listener-dbus.c:1960
 msgid "not connected to the message bus"
 msgstr "tidak bersambung dengan bas mesej"
 
-#: ../src/gs-listener-dbus.c:2197 ../src/gs-listener-dbus.c:2229
+#: ../src/gs-listener-dbus.c:1969 ../src/gs-listener-dbus.c:1999
 msgid "screensaver already running in this session"
 msgstr "penyelamat skrin telah berjalan dalam sesi ini"
 
-#: ../src/gs-lock-plug.c:293
+#: ../src/gs-lock-plug.c:269
+msgctxt "Date"
 msgid "%A, %B %e   %H:%M"
 msgstr "%A, %B %e   %H:%M"
 
-#: ../src/gs-lock-plug.c:388
+#: ../src/gs-lock-plug.c:352
 msgid "Time has expired."
 msgstr "Tamat tempoh."
 
-#: ../src/gs-lock-plug.c:1310
+#: ../src/gs-lock-plug.c:1180
 msgid "S_witch User..."
 msgstr "T_ukar Pengguna..."
 
-#: ../src/gs-lock-plug.c:1319
+#: ../src/gs-lock-plug.c:1189
 msgid "Log _Out"
 msgstr "Daftar _Keluar"
 
-#: ../src/gs-lock-plug.c:1330 ../src/xfce4-screensaver-dialog.ui.h:8
+#: ../src/gs-lock-plug.c:1200 ../src/xfce4-screensaver-dialog.ui.h:8
 msgid "_Unlock"
 msgstr "_Buka"
 
 #. To translators: This expands to USERNAME on HOSTNAME
-#: ../src/gs-lock-plug.c:1515
+#: ../src/gs-lock-plug.c:1366
 msgid "%U on %h"
 msgstr "%U pada %h"
 
-#: ../src/gs-lock-plug.c:1530
+#: ../src/gs-lock-plug.c:1381
 msgid "Please enter your password."
 msgstr "Sila masukkan kata laluan anda."
 
 #. Translators: a CRTC is a CRT Controller (this is X terminology).
-#: ../src/xfce-rr.c:478
+#: ../src/xfce-rr.c:444
 #, c-format
 msgid "could not get the screen resources (CRTCs, outputs, modes)"
 msgstr "tidak memperoleh sumber skrin (CRTC, output, mod)"
 
-#: ../src/xfce-rr.c:499
+#: ../src/xfce-rr.c:465
 #, c-format
 msgid "unhandled X error while getting the range of screen sizes"
 msgstr "ralat X tidak dikendali ketika mendapatkan julat saiz skrin"
 
-#: ../src/xfce-rr.c:505
+#: ../src/xfce-rr.c:471
 #, c-format
 msgid "could not get the range of screen sizes"
 msgstr "tidak memperoleh julat saiz skrin"
 
-#: ../src/xfce-rr.c:730
+#: ../src/xfce-rr.c:682
 #, c-format
 msgid "RANDR extension is not present"
 msgstr "Sambungan RANDR tidak hadir"
 
-#: ../src/xfce-rr.c:1146
+#: ../src/xfce-rr.c:1075
 #, c-format
 msgid "could not get information about output %d"
 msgstr "tidak memperoleh maklumat berkenaan output %d"
 
-#: ../src/xfce-rr.c:1389
+#: ../src/xfce-rr.c:1298
 #, c-format
 msgid "could not get information about CRTC %d"
 msgstr "tidak memperoleh maklumat berkenaan CRTC %d"
 
-#: ../src/xfce4-screensaver-command.c:59
+#: ../src/xfce4-screensaver-command.c:60
 msgid "Causes the screensaver to exit gracefully"
 msgstr "Menyebabkan penyelamatan skrin keluar dengan cara elok"
 
-#: ../src/xfce4-screensaver-command.c:63
+#: ../src/xfce4-screensaver-command.c:64
 msgid "Query the state of the screensaver"
 msgstr "Tanya keadaan penyelamat skrin"
 
-#: ../src/xfce4-screensaver-command.c:67
+#: ../src/xfce4-screensaver-command.c:68
 msgid "Query the length of time the screensaver has been active"
 msgstr "Tanya tempoh masa aktif penyelamat skrin "
 
-#: ../src/xfce4-screensaver-command.c:71
+#: ../src/xfce4-screensaver-command.c:72
 msgid "Tells the running screensaver process to lock the screen immediately"
 msgstr ""
 "Beritahu proses penyelamat skrin yang berjalan untuk mengunci skrin serta-"
 "merta"
 
-#: ../src/xfce4-screensaver-command.c:75
+#: ../src/xfce4-screensaver-command.c:76
 msgid "If the screensaver is active then switch to another graphics demo"
 msgstr "Jika penyelamat skrin aktif maka beralih ke demo grafik yang lain"
 
-#: ../src/xfce4-screensaver-command.c:79
+#: ../src/xfce4-screensaver-command.c:80
 msgid "Turn the screensaver on (blank the screen)"
 msgstr "Hidupkan penyelamat skrin (gelapkan skrin)"
 
-#: ../src/xfce4-screensaver-command.c:83
+#: ../src/xfce4-screensaver-command.c:84
 msgid "If the screensaver is active then deactivate it (un-blank the screen)"
 msgstr ""
 "Jika penyelamat skrin aktif maka nyahaktifkannya (jangan gelapkan skrin)"
 
-#: ../src/xfce4-screensaver-command.c:87
+#: ../src/xfce4-screensaver-command.c:88
 msgid "Poke the running screensaver to simulate user activity"
 msgstr ""
 "Ganggu penyelamat skrin yang berlangsung untuk simulasikan aktiviti pengguna"
 
-#: ../src/xfce4-screensaver-command.c:91
+#: ../src/xfce4-screensaver-command.c:92
 msgid ""
 "Inhibit the screensaver from activating.  Command blocks while inhibit is "
 "active."
@@ -319,156 +321,155 @@ msgstr ""
 "Rencatkan penyelamat skrin yang masih aktif. Perintah sekat jika rencat "
 "diaktifkan."
 
-#: ../src/xfce4-screensaver-command.c:95
+#: ../src/xfce4-screensaver-command.c:96
 msgid "The calling application that is inhibiting the screensaver"
 msgstr "Aplikasi memanggil yang merencatkan penyelamat skrin"
 
-#: ../src/xfce4-screensaver-command.c:99
+#: ../src/xfce4-screensaver-command.c:100
 msgid "The reason for inhibiting the screensaver"
 msgstr "Sebab merencatkan penyelamat skrin"
 
-#: ../src/xfce4-screensaver-command.c:103 ../src/xfce4-screensaver-dialog.c:65
-#: ../src/xfce4-screensaver.c:59
+#: ../src/xfce4-screensaver-command.c:104 ../src/xfce4-screensaver-dialog.c:65
+#: ../src/xfce4-screensaver.c:58
 msgid "Version of this application"
 msgstr "Versi aplikasi ini"
 
-#: ../src/xfce4-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:325
 #, c-format
 msgid "The screensaver is %s\n"
 msgstr "Penyelamat skrin adalah %s\n"
 
-#: ../src/xfce4-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:325
 msgid "active"
 msgstr "aktif"
 
-#: ../src/xfce4-screensaver-command.c:352
+#: ../src/xfce4-screensaver-command.c:325
 msgid "inactive"
 msgstr "Tidak aktif"
 
-#: ../src/xfce4-screensaver-command.c:368
+#: ../src/xfce4-screensaver-command.c:339
 #, c-format
 msgid "The screensaver is not inhibited\n"
 msgstr "Penyelamat skrin tidak direncatkan\n"
 
-#: ../src/xfce4-screensaver-command.c:376
+#: ../src/xfce4-screensaver-command.c:345
 #, c-format
 msgid "The screensaver is being inhibited by:\n"
 msgstr "Penyelamat skrin telah direncatkan oleh:\n"
 
-#: ../src/xfce4-screensaver-command.c:411
+#: ../src/xfce4-screensaver-command.c:375
 #, c-format
 msgid "The screensaver has been active for %d seconds.\n"
 msgstr "Penyelamat skrin telah aktif dalam tempoh %d saat.\n"
 
-#: ../src/xfce4-screensaver-command.c:417
+#: ../src/xfce4-screensaver-command.c:379
 #, c-format
 msgid "The screensaver is not currently active.\n"
 msgstr "Penyelamat skrin kini tidak aktif.\n"
 
-#: ../src/xfce4-screensaver-dialog.c:64
+#: ../src/xfce4-screensaver-dialog.c:63
 msgid "Show debugging output"
 msgstr "Tunjuk output penyahpepijatan"
 
-#: ../src/xfce4-screensaver-dialog.c:66
+#: ../src/xfce4-screensaver-dialog.c:67
 msgid "Show the logout button"
 msgstr "Tunjuk butang daftar keluar"
 
-#: ../src/xfce4-screensaver-dialog.c:67
+#: ../src/xfce4-screensaver-dialog.c:69
 msgid "Command to invoke from the logout button"
 msgstr "Perintah untuk diseru menerusi butang daftar keluar"
 
-#: ../src/xfce4-screensaver-dialog.c:68
+#: ../src/xfce4-screensaver-dialog.c:71
 msgid "Show the switch user button"
 msgstr "Tunjuk butang tukar pengguna"
 
-#: ../src/xfce4-screensaver-dialog.c:69
+#: ../src/xfce4-screensaver-dialog.c:73
 msgid "Message to show in the dialog"
 msgstr "Mesej yang ditunjukkan dalam dialog"
 
-#: ../src/xfce4-screensaver-dialog.c:69 ../src/xfce4-screensaver-dialog.c:70
+#: ../src/xfce4-screensaver-dialog.c:73 ../src/xfce4-screensaver-dialog.c:75
 msgid "MESSAGE"
 msgstr "MESEJ"
 
-#: ../src/xfce4-screensaver-dialog.c:70
+#: ../src/xfce4-screensaver-dialog.c:75
 msgid "Not used"
 msgstr "Tidak digunakan"
 
-#: ../src/xfce4-screensaver-dialog.c:71
+#: ../src/xfce4-screensaver-dialog.c:77
 msgid "Monitor height"
 msgstr "Tinggi monitor"
 
-#: ../src/xfce4-screensaver-dialog.c:72
+#: ../src/xfce4-screensaver-dialog.c:79
 msgid "Monitor width"
 msgstr "Lebar monitor"
 
-#: ../src/xfce4-screensaver-dialog.c:73
+#: ../src/xfce4-screensaver-dialog.c:81
 msgid "Monitor index"
 msgstr "Indeks monitor"
 
-#. login: is whacked always translate to Username:
-#: ../src/xfce4-screensaver-dialog.c:177 ../src/xfce4-screensaver-dialog.c:178
-#: ../src/xfce4-screensaver-dialog.c:179
+#: ../src/xfce4-screensaver-dialog.c:175 ../src/xfce4-screensaver-dialog.c:177
+#: ../src/xfce4-screensaver-dialog.c:178
 msgid "Please enter your username."
 msgstr "Sila masukkan nama pengguna anda."
 
-#: ../src/xfce4-screensaver-dialog.c:182
+#: ../src/xfce4-screensaver-dialog.c:184
 msgid "You are required to change your password immediately (password aged)"
 msgstr ""
 "Anda perlu menukar kata laluan anda serta-merta (kata laluan sudah lama)"
 
-#: ../src/xfce4-screensaver-dialog.c:183
+#: ../src/xfce4-screensaver-dialog.c:186
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Anda perlu menukar kata laluan anda serta-merta (dipaksa root)"
 
-#: ../src/xfce4-screensaver-dialog.c:184
+#: ../src/xfce4-screensaver-dialog.c:188
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Akaun anda telah luput; sila hubungi pentadbir sistem anda"
 
-#: ../src/xfce4-screensaver-dialog.c:185
+#: ../src/xfce4-screensaver-dialog.c:190
 msgid "No password supplied."
 msgstr "Tiada kata laluan diperlukan."
 
-#: ../src/xfce4-screensaver-dialog.c:186
+#: ../src/xfce4-screensaver-dialog.c:192
 msgid "Password unchanged."
 msgstr "Kata laluan tidak berubah."
 
-#: ../src/xfce4-screensaver-dialog.c:187
+#: ../src/xfce4-screensaver-dialog.c:194
 msgid "Can not get username."
 msgstr "Tidak memperoleh nama pengguna."
 
-#: ../src/xfce4-screensaver-dialog.c:188
+#: ../src/xfce4-screensaver-dialog.c:196
 msgid "Retype your new password."
 msgstr "Taip semula kata laluan anda."
 
-#: ../src/xfce4-screensaver-dialog.c:189
+#: ../src/xfce4-screensaver-dialog.c:198
 msgid "Enter your new password."
 msgstr "Masukkan kata laluan baharu anda."
 
-#: ../src/xfce4-screensaver-dialog.c:190
+#: ../src/xfce4-screensaver-dialog.c:200
 msgid "Enter your current password:"
 msgstr "Masukkan kata laluan semasa anda:"
 
-#: ../src/xfce4-screensaver-dialog.c:191
+#: ../src/xfce4-screensaver-dialog.c:202
 msgid "Error while changing NIS password."
 msgstr "Ralat ketika mengubah kata laluan NIS."
 
-#: ../src/xfce4-screensaver-dialog.c:192
+#: ../src/xfce4-screensaver-dialog.c:204
 msgid "You must choose a longer password."
 msgstr "Anda mesti pilih kata laluan yang lebih panjang."
 
-#: ../src/xfce4-screensaver-dialog.c:193
+#: ../src/xfce4-screensaver-dialog.c:206
 msgid "Password has been already used. Choose another."
 msgstr "Kata laluan sudah digunakan. Pilih yang lain."
 
-#: ../src/xfce4-screensaver-dialog.c:194
+#: ../src/xfce4-screensaver-dialog.c:208
 msgid "You must wait longer to change your password."
 msgstr "Anda mesti tunggu lebih lama untuk menukar kata laluan anda."
 
-#: ../src/xfce4-screensaver-dialog.c:195
+#: ../src/xfce4-screensaver-dialog.c:210
 msgid "Sorry, passwords do not match."
 msgstr "Maaf, kata laluan tidak sepadan."
 
-#: ../src/xfce4-screensaver-dialog.c:269
+#: ../src/xfce4-screensaver-dialog.c:274
 msgid "Checking..."
 msgstr "Memeriksa..."
 
@@ -503,83 +504,31 @@ msgstr "<b>%h</b>"
 msgid "<b>%s</b>"
 msgstr "<b>%s</b>"
 
-#: ../src/xfce4-screensaver-preferences.c:86
+#: ../src/xfce4-screensaver-preferences.c:83
 msgid "Settings manager socket"
 msgstr "Tetapkan soket pengurus"
 
-#: ../src/xfce4-screensaver-preferences.c:86
+#: ../src/xfce4-screensaver-preferences.c:83
 msgid "SOCKET ID"
 msgstr "ID SOKET"
 
-#: ../src/xfce4-screensaver-preferences.c:451
+#: ../src/xfce4-screensaver-preferences.c:641
 msgid "Blank screen"
 msgstr "Skrin gelap"
 
-#: ../src/xfce4-screensaver-preferences.c:457
+#: ../src/xfce4-screensaver-preferences.c:647
 msgid "Random"
 msgstr "Rawak"
 
-#: ../src/xfce4-screensaver-preferences.c:943
-#: ../src/xfce4-screensaver-preferences.c:953
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d jam"
-
-#: ../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"
-msgstr[0] "%d minit"
-
-#: ../src/xfce4-screensaver-preferences.c:949
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d saat"
-
-#. hour:minutes
-#. minutes:seconds
-#: ../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:994
-#, c-format
-msgid "%s %s %s"
-msgstr "%s %s %s"
-
-#. hour
-#. minutes
-#. seconds
-#: ../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:1068
-#, c-format
-msgid "Never"
-msgstr "Tidak sesekali"
+#: ../src/xfce4-screensaver-preferences.c:1828
+msgid "Setting locked by administrator."
+msgstr "Tetapan dikunci oleh pentadbir."
 
-#: ../src/xfce4-screensaver-preferences.c:1566
+#: ../src/xfce4-screensaver-preferences.c:1868
 msgid "Could not load the main interface"
 msgstr "Tidak dapat memuatkan antaramuka utama"
 
-#: ../src/xfce4-screensaver-preferences.c:1568
+#: ../src/xfce4-screensaver-preferences.c:1870
 msgid "Please make sure that the screensaver is properly installed"
 msgstr "Sila pastikan penyelamat skrin telah dipasang dengan baik"
 
@@ -604,8 +553,8 @@ msgid "Power _Management"
 msgstr "Pen_gurusan Kuasa"
 
 #: ../src/xfce4-screensaver-preferences.ui.h:6
-msgid "_Preview"
-msgstr "_Pratonton"
+msgid "Preview"
+msgstr "Pratonton"
 
 #: ../src/xfce4-screensaver-preferences.ui.h:7
 msgid "Running as root"
@@ -631,26 +580,78 @@ msgstr ""
 "Komputer anda tidak dikunci ketika anda menutup penutup komputer riba."
 
 #: ../src/xfce4-screensaver-preferences.ui.h:12
-msgid "_Screensaver theme:"
-msgstr "Tema penyelamat _skrin:"
+msgid "Enable Screensaver"
+msgstr "Benarkan Penyelamat Skrin"
 
 #: ../src/xfce4-screensaver-preferences.ui.h:13
-msgid "Regard the computer as _idle after:"
-msgstr "Anggap komputer telah me_lahu selepas:"
+msgid "Theme"
+msgstr "Tema"
 
 #: ../src/xfce4-screensaver-preferences.ui.h:14
-msgid "_Activate screensaver when computer is idle"
-msgstr "_Aktifkan penyelamat skrin ketika komputer melahu"
+msgid "Change theme after:"
+msgstr "Ubah tema selepas:"
 
 #: ../src/xfce4-screensaver-preferences.ui.h:15
-msgid "_Lock screen when screensaver is active"
-msgstr "_Kunci skrin jika penyelamat skrin aktif"
+msgid "minutes"
+msgstr "minit"
 
-#: ../src/xfce4-screensaver.c:60
+#: ../src/xfce4-screensaver-preferences.ui.h:16
+msgid "Activate screensaver when computer is idle"
+msgstr "Aktifkan penyelamat skrin ketika komputer melahu"
+
+#: ../src/xfce4-screensaver-preferences.ui.h:17
+msgid "Regard the computer as _idle after:"
+msgstr "Anggap komputer telah me_lahu selepas:"
+
+#: ../src/xfce4-screensaver-preferences.ui.h:19
+msgid "Enable Lock Screen"
+msgstr "Benarkan Skrin Kunci"
+
+#: ../src/xfce4-screensaver-preferences.ui.h:20
+msgid "Lock Screen with Screensaver"
+msgstr "Kunci Skrin dengan Penyelamat Skrin"
+
+#: ../src/xfce4-screensaver-preferences.ui.h:21
+msgid "Lock the screen after the screensaver is active for:"
+msgstr "Kunci skrin selepas penyelamat skrin aktif dalam tempoh:"
+
+#: ../src/xfce4-screensaver-preferences.ui.h:22
+msgid "On Screen Keyboard"
+msgstr "Papan Kekunci Atas Skrin"
+
+#: ../src/xfce4-screensaver-preferences.ui.h:23
+msgid "On screen keyboard command:"
+msgstr "Perintah papan kekunci atas skrin:"
+
+#: ../src/xfce4-screensaver-preferences.ui.h:24
+msgid "Session Status Messages"
+msgstr "Mesej Status Sesi"
+
+#: ../src/xfce4-screensaver-preferences.ui.h:25
+msgid "Logout"
+msgstr "Daftar Keluar"
+
+#: ../src/xfce4-screensaver-preferences.ui.h:26
+msgid "Logout command:"
+msgstr "Perintah daftar keluar:"
+
+#: ../src/xfce4-screensaver-preferences.ui.h:27
+msgid "Enable logout after:"
+msgstr "Benarkan daftar keluar selepas:"
+
+#: ../src/xfce4-screensaver-preferences.ui.h:28
+msgid "User Switching"
+msgstr "Pertukaran Pengguna"
+
+#: ../src/xfce4-screensaver-preferences.ui.h:29
+msgid "Lock Screen"
+msgstr "Skrin Kunci"
+
+#: ../src/xfce4-screensaver.c:59
 msgid "Don't become a daemon"
 msgstr "Jangan dijadikan sebagai daemon"
 
-#: ../src/xfce4-screensaver.c:61
+#: ../src/xfce4-screensaver.c:60
 msgid "Enable debugging code"
 msgstr "Benarkan kod penyahpepijatan"
 
@@ -658,11 +659,6 @@ msgstr "Benarkan kod penyahpepijatan"
 msgid "Launch screensaver and locker program"
 msgstr "Lancar penyelamat skrin dan program pengunci"
 
-#: ../src/xfcekbd-indicator.c:111
-#, c-format
-msgid "There was an error loading an image: %s"
-msgstr "Terdapat ralat ketika memuatkan imej: %s"
-
-#: ../src/xfcekbd-indicator.c:688
+#: ../src/xfcekbd-indicator.c:533
 msgid "XKB initialization error"
 msgstr "Ralat pengawalan XKB"