diff --git a/po/sk.po b/po/sk.po
index c573d31..3f6904c 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,376 +1,353 @@
-# Slovak translations for xfce4-taskmanager package.
-# Copyright (C) 2005-2008 Johannes Zellner.
-# This file is distributed under the same license as the xfce4-taskmanager package.
-# Robert Hartl <hartl.robert@gmail.com>, 2009-2010.
-# Tomáš Vadina <kyberdev@gmail.com>, 2011.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Slavko <linux@slavino.sk>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: xfce4-taskmanager\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-20 04:18+0000\n"
-"PO-Revision-Date: 2011-05-20 12:33+0100\n"
-"Last-Translator: Tomáš Vadina <kyberdev@gmail.com>\n"
-"Language-Team: Slovak <xfce-i18n@xfce.org>\n"
+"POT-Creation-Date: 2014-12-20 00:31+0100\n"
+"PO-Revision-Date: 2015-02-26 15:10+0000\n"
+"Last-Translator: Slavko <linux@slavino.sk>\n"
+"Language-Team: Slovak (http://www.transifex.com/projects/p/xfce-apps/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ../xfce4-taskmanager.desktop.in.h:1
-#: ../src/process-window.c:309
-msgid "Easy to use task manager"
-msgstr "Ľahko použiteľný správca úloh"
-
-#: ../xfce4-taskmanager.desktop.in.h:2
-#: ../src/exec-tool-button.c:89
-#: ../src/exec-tool-button.c:134
-#: ../src/main.c:156
-#: ../src/process-tree-view.c:355
-#: ../src/process-tree-view.c:370
-#: ../src/process-tree-view.c:398
-#: ../src/process-window.c:304
-#: ../src/process-window.ui.h:1
+#: ../xfce4-taskmanager.desktop.in.h:1 ../src/exec-tool-button.c:106
+#: ../src/exec-tool-button.c:151 ../src/main.c:186
+#: ../src/process-tree-view.c:372 ../src/process-tree-view.c:387
+#: ../src/process-tree-view.c:415 ../src/process-window.c:389
+#: ../src/process-window.ui.h:1 ../src/process-window-gtk3.ui.h:1
 msgid "Task Manager"
 msgstr "Správca úloh"
 
-#: ../src/exec-tool-button.c:87
-#: ../src/exec-tool-button.c:131
+#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-window.c:396
+msgid "Easy to use task manager"
+msgstr "Jednoducho použiteľný správca úloh"
+
+#: ../src/exec-tool-button.c:104 ../src/exec-tool-button.c:148
 msgid "Execution error"
 msgstr "Chyba spustenia"
 
-#: ../src/exec-tool-button.c:133
+#: ../src/exec-tool-button.c:150
 msgid "Couldn't find any default command to run."
 msgstr "Nemožno nájsť žiadny predvolený príkaz na spustenie"
 
-#: ../src/exec-tool-button.c:164
+#: ../src/exec-tool-button.c:181
 msgid "Run Task Manager as root"
 msgstr "Spustiť Správcu úloh ako root"
 
-#: ../src/exec-tool-button.c:175
-#: ../src/exec-tool-button.c:177
-#: ../src/exec-tool-button.c:179
+#: ../src/exec-tool-button.c:192 ../src/exec-tool-button.c:194
+#: ../src/exec-tool-button.c:196
 msgid "Run Program..."
 msgstr "Spustiť program..."
 
-#: ../src/exec-tool-button.c:182
+#: ../src/exec-tool-button.c:199
 msgid "Application Finder"
-msgstr "Vyhľadávač aplikácií"
+msgstr " \nVyhľadávač aplikácií"
 
-#: ../src/exec-tool-button.c:185
+#: ../src/exec-tool-button.c:202
 msgid "Terminal emulator"
 msgstr "Emulátor terminálu"
 
-#: ../src/exec-tool-button.c:187
+#: ../src/exec-tool-button.c:204
 msgid "XTerm"
 msgstr "XTerm"
 
-#: ../src/main.c:100
+#: ../src/main.c:126
 #, c-format
 msgid ""
 "<b>Processes:</b> %u\n"
 "<b>CPU:</b> %.0f%%\n"
-"<b>Memory:</b> %.0f%%\n"
-"<b>Swap:</b> %.0f%%"
-msgstr ""
-"\t\r\n"
-"\r\n"
-"<b>Procesy:</b> %u\n"
-"<b>CPU:</b> %.0f%%\n"
-"<b>Pamäť:</b> %.0f%%\n"
-"<b>Swap:</b> %.0f%%"
+"<b>Memory:</b> %s\n"
+"<b>Swap:</b> %s"
+msgstr "<b>Procesy:</b> %u\n<b>CPU:</b> %.0f%%\n<b>Pamäť:</b> %s\n<b>Swap:</b> %s"
 
-#: ../src/main.c:108
+#: ../src/main.c:134
 #, c-format
 msgid ""
 "Processes: %u\n"
 "CPU: %.0f%%\n"
-"Memory: %.0f%%\n"
-"Swap: %.0f%%"
-msgstr ""
-"Procesy: %u\n"
-"CPU: %.0f%%\n"
-"Pamäť: %.0f%%\n"
-"Swap: %.0f%%"
+"Memory: %s\n"
+"Swap: %s"
+msgstr "Procesy: %u\nCPU: %.0f%%\nPamäť: %s\nSwap: %s"
 
-#: ../src/process-statusbar.c:148
-#: ../src/process-window.c:374
+#: ../src/process-statusbar.c:147 ../src/process-window.c:461
 #, c-format
 msgid "CPU: %s%%"
 msgstr "CPU: %s%%"
 
-#: ../src/process-statusbar.c:157
-#: ../src/process-window.c:379
+#: ../src/process-statusbar.c:162 ../src/process-window.c:465
 #, c-format
-msgid "Memory: %s%%"
-msgstr "Pamäť: %s%%"
+msgid "Memory: %s"
+msgstr "Pamäť: %s"
 
-#: ../src/process-statusbar.c:166
+#: ../src/process-statusbar.c:176
 #, c-format
-msgid "Swap: %s%%"
-msgstr "Swap: %s%%"
+msgid "Swap: %s"
+msgstr "Swap: %s"
 
-#: ../src/process-statusbar.c:181
+#: ../src/process-statusbar.c:190
 #, c-format
 msgid "Processes: %d"
 msgstr "Procesy: %d"
 
-#: ../src/process-tree-view.c:125
-msgid "Task"
-msgstr "Úloha"
-
 #: ../src/process-tree-view.c:136
-#: ../src/settings-tool-button.c:174
+msgid "Task"
+msgstr "Uloha"
+
+#: ../src/process-tree-view.c:147 ../src/settings-tool-button.c:175
 msgid "PID"
 msgstr "PID"
 
-#: ../src/process-tree-view.c:144
-#: ../src/settings-tool-button.c:175
+#: ../src/process-tree-view.c:155 ../src/settings-tool-button.c:176
 msgid "PPID"
 msgstr "PPID"
 
-#: ../src/process-tree-view.c:152
-#: ../src/settings-tool-button.c:176
+#: ../src/process-tree-view.c:163 ../src/settings-tool-button.c:177
 msgid "State"
 msgstr "Stav"
 
-#: ../src/process-tree-view.c:161
+#: ../src/process-tree-view.c:172
 msgid "VSZ"
 msgstr "VSZ"
 
-#: ../src/process-tree-view.c:169
+#: ../src/process-tree-view.c:180
 msgid "RSS"
 msgstr "RSS"
 
-#: ../src/process-tree-view.c:177
-#: ../src/settings-tool-button.c:179
+#: ../src/process-tree-view.c:188 ../src/settings-tool-button.c:180
 msgid "UID"
 msgstr "UID"
 
-#: ../src/process-tree-view.c:185
-#: ../src/settings-tool-button.c:180
+#: ../src/process-tree-view.c:196 ../src/settings-tool-button.c:181
 msgid "CPU"
 msgstr "CPU"
 
-#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view header.
-#: ../src/process-tree-view.c:194
+#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view
+#. header.
+#: ../src/process-tree-view.c:205
 msgid "Prio."
 msgstr "Prio."
 
-#: ../src/process-tree-view.c:352
+#: ../src/process-tree-view.c:369
 msgid "Terminate task"
 msgstr "Ukončiť úlohu"
 
-#: ../src/process-tree-view.c:352
+#: ../src/process-tree-view.c:369
 msgid "Kill task"
 msgstr "Zabiť úlohu"
 
-#: ../src/process-tree-view.c:354
+#: ../src/process-tree-view.c:371
 #, c-format
 msgid "Are you sure you want to send a signal to the PID %d?"
-msgstr "Ste si istí, že chcete odoslať signál pre PID %d?"
+msgstr "Naozaj chcete poslať signál do PID %d?"
 
-#: ../src/process-tree-view.c:366
+#: ../src/process-tree-view.c:383
 msgid "Error sending signal"
-msgstr "Chyba pri odosielaní signálu"
+msgstr "Chyba  poslania signálu"
 
-#: ../src/process-tree-view.c:368
+#: ../src/process-tree-view.c:385
 #, c-format
-msgid "An error was encountered by sending a signal to the PID %d. It is likely you don't have the required privileges."
-msgstr "Pri odosielaní signálu procesu s identifikátorom PID %d nastala chyba. Pravdepodobne nemáte potrebné oprávnenia."
+msgid ""
+"An error was encountered by sending a signal to the PID %d. It is likely you"
+" don't have the required privileges."
+msgstr "Pri posielaní signálu do PID %d nastala chyba. Je pravdepodobné, že nemáte dostatočné práva."
 
-#: ../src/process-tree-view.c:395
+#: ../src/process-tree-view.c:412
 msgid "Error setting priority"
 msgstr "Chyba nastavenia priority"
 
-#: ../src/process-tree-view.c:396
+#: ../src/process-tree-view.c:413
 #, c-format
-msgid "An error was encountered by setting a priority to the PID %d. It is likely you don't have the required privileges."
-msgstr "Pri nastavovaní priority procesu s identifikátorom PID %d nastala chyba. Pravdepodobne nemáte potrebné oprávnenia."
+msgid ""
+"An error was encountered by setting a priority to the PID %d. It is likely "
+"you don't have the required privileges."
+msgstr "Pri nastavovaní priority PID %d nastala chyba. Je pravdepodobné, že nemáte dostatočné práva."
 
-#: ../src/process-tree-view.c:412
+#: ../src/process-tree-view.c:429
 msgid "Terminate"
 msgstr "Ukončiť"
 
-#: ../src/process-tree-view.c:420
+#: ../src/process-tree-view.c:437
 msgid "Stop"
 msgstr "Zastaviť"
 
-#: ../src/process-tree-view.c:427
+#: ../src/process-tree-view.c:444
 msgid "Continue"
 msgstr "Pokračovať"
 
-#: ../src/process-tree-view.c:433
+#: ../src/process-tree-view.c:450
 msgid "Kill"
 msgstr "Zabiť"
 
-#: ../src/process-tree-view.c:440
+#: ../src/process-tree-view.c:457
 msgid "Very low"
 msgstr "Veľmi nízka"
 
-#: ../src/process-tree-view.c:445
+#: ../src/process-tree-view.c:462
 msgid "Low"
 msgstr "Nízka"
 
-#: ../src/process-tree-view.c:450
+#: ../src/process-tree-view.c:467
 msgid "Normal"
 msgstr "Normálna"
 
-#: ../src/process-tree-view.c:455
+#: ../src/process-tree-view.c:472
 msgid "High"
 msgstr "Vysoká"
 
-#: ../src/process-tree-view.c:460
+#: ../src/process-tree-view.c:477
 msgid "Very high"
 msgstr "Veľmi vysoká"
 
-#: ../src/process-tree-view.c:465
-#: ../src/settings-tool-button.c:181
+#: ../src/process-tree-view.c:482 ../src/settings-tool-button.c:182
 msgid "Priority"
 msgstr "Priorita"
 
-#: ../src/process-window.c:312
+#: ../src/process-window.c:205
+#, c-format
+msgid ""
+"<span foreground='#000000' background='#aed581'>    </span> Starting task\n"
+"<span foreground='#000000' background='#fff176'>    </span> Changing task\n"
+"<span foreground='#000000' background='#e57373'>    </span> Terminating task"
+msgstr "<span foreground='#000000' background='#aed581'>    </span> Štartujúce úlohy\n<span foreground='#000000' background='#fff176'>    </span> Menené úlohy\n<span foreground='#000000' background='#e57373'>    </span> Končiace úlohy"
+
+#: ../src/process-window.c:215
+msgid "Filter on process name"
+msgstr "Filtrovať mená procesov"
+
+#: ../src/process-window.c:399
 msgid "translator-credits"
-msgstr ""
-"Robert Hartl <hartl.robert@gmail.com>, 2010.\n"
-"Tomáš Vadina <kyberdev@gmail.com>, 2011."
+msgstr "Slavko <linux@slavino.sk>"
 
-#: ../src/process-window.ui.h:2
+#: ../src/process-window.ui.h:2 ../src/process-window-gtk3.ui.h:2
 msgid "Warning, you are using the root account, you may harm your system."
-msgstr "Pozor, používate účet root, môžete poškodiť svoj systém."
+msgstr "Upozornenie, používate účet root, môžete poškodiť svoj systém."
 
-#: ../src/settings.c:378
+#: ../src/settings.c:387
 msgid "Default"
 msgstr "Predvolené"
 
-#: ../src/settings.c:379
+#: ../src/settings.c:388
 msgid "Small"
 msgstr "Malé"
 
-#: ../src/settings.c:380
+#: ../src/settings.c:389
 msgid "Large"
 msgstr "Veľké"
 
-#: ../src/settings.c:381
+#: ../src/settings.c:390
 msgid "Text"
 msgstr "Text"
 
-#: ../src/settings-dialog.ui.h:1
-msgid "<b>Information</b>"
-msgstr "<b>Informácie</b>"
-
-#: ../src/settings-dialog.ui.h:2
-msgid "<b>Interface style</b>"
-msgstr "<b>Štýl rozhrania</b>"
-
-#: ../src/settings-dialog.ui.h:3
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>Rôzne</b>"
-
-#: ../src/settings-dialog.ui.h:4
-msgid "Columns:"
-msgstr "Stĺpce:"
-
-#: ../src/settings-dialog.ui.h:5
-msgid "Draw borders around monitors"
-msgstr "Vykresľovať okraje okolo monitorov"
-
-#: ../src/settings-dialog.ui.h:6
-msgid "Hide into the notification area"
-msgstr "Skryť do oznamovacej oblasti"
-
-#: ../src/settings-dialog.ui.h:7
-msgid "Prompt for terminating tasks"
-msgstr "Pýtať sa na ukončovanie úloh"
-
-#: ../src/settings-dialog.ui.h:8
-msgid "Refresh rate:"
-msgstr "Obnovovacia frekvencia"
-
-#: ../src/settings-dialog.ui.h:9
-msgid "Settings"
-msgstr "Nastavenia"
-
-#: ../src/settings-dialog.ui.h:10
+#: ../src/settings-dialog.ui.h:1 ../src/settings-dialog-gtk3.ui.h:1
 msgid "Settings for Task Manager"
-msgstr "Nastavenia pre Správcu úloh"
+msgstr "Nastavenia Správcu úloh"
 
-#: ../src/settings-dialog.ui.h:11
+#: ../src/settings-dialog.ui.h:2 ../src/settings-dialog-gtk3.ui.h:2
 msgid "Show application icons"
 msgstr "Zobraziť ikony aplikácií"
 
-#: ../src/settings-dialog.ui.h:12
+#: ../src/settings-dialog.ui.h:3 ../src/settings-dialog-gtk3.ui.h:3
 msgid "Show full command lines"
-msgstr "Zobrazovať celé riadky príkazov"
+msgstr "Zobraziť celý príkazový riadok"
 
-#: ../src/settings-dialog.ui.h:13
+#: ../src/settings-dialog.ui.h:4 ../src/settings-dialog-gtk3.ui.h:4
 msgid "Show values with more precision"
-msgstr "Zobrazovať hodnoty s väčšou presnosťou"
+msgstr "Zobraziť hodnoty s vyššou presnosťou"
 
-#: ../src/settings-dialog.ui.h:14
+#: ../src/settings-dialog.ui.h:5 ../src/settings-dialog-gtk3.ui.h:5
+msgid "Show processes as tree"
+msgstr "Zobraziť procesy ako strom"
+
+#: ../src/settings-dialog.ui.h:6 ../src/settings-dialog-gtk3.ui.h:6
+msgid "Show memory usage in bytes"
+msgstr "Zobraziť využitie pamäte v bajtoch"
+
+#: ../src/settings-dialog.ui.h:7 ../src/settings-dialog-gtk3.ui.h:7
 msgid "Toolbar style:"
-msgstr "Štýl panelu nástrojov"
+msgstr "Štýl panela nástrojov:"
+
+#: ../src/settings-dialog.ui.h:8 ../src/settings-dialog-gtk3.ui.h:8
+msgid "<b>Interface style</b>"
+msgstr "<b>Štýl rozhrania</b>"
+
+#: ../src/settings-dialog.ui.h:9 ../src/settings-dialog-gtk3.ui.h:9
+msgid "Prompt for terminating tasks"
+msgstr "Potvrdiť ukončenie úloh"
+
+#: ../src/settings-dialog.ui.h:10 ../src/settings-dialog-gtk3.ui.h:10
+msgid "Hide into the notification area"
+msgstr "Skryť do oznamovacej oblasti"
+
+#: ../src/settings-dialog.ui.h:11 ../src/settings-dialog-gtk3.ui.h:11
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Rôzne</b>"
+
+#: ../src/settings-dialog.ui.h:12 ../src/settings-dialog-gtk3.ui.h:12
+msgid "Refresh rate:"
+msgstr "Rýchlosť obnovovania:"
+
+#: ../src/settings-dialog.ui.h:13 ../src/settings-dialog-gtk3.ui.h:13
+msgid "Columns:"
+msgstr "Stĺpce:"
+
+#: ../src/settings-dialog.ui.h:14 ../src/settings-dialog-gtk3.ui.h:14
+msgid "<b>Information</b>"
+msgstr "<b>Informácie</b>"
+
+#: ../src/settings-dialog.ui.h:15 ../src/settings-dialog-gtk3.ui.h:15
+msgid "Settings"
+msgstr "Nastavenie"
 
 #. TRANSLATORS: The next values are in seconds or milliseconds
-#: ../src/settings-tool-button.c:110
-msgid "500ms"
-msgstr ""
-"\t\r\n"
-"\r\n"
-"500ms"
-
 #: ../src/settings-tool-button.c:111
-msgid "750ms"
-msgstr "750ms"
+msgid "500ms"
+msgstr "500 ms"
 
 #: ../src/settings-tool-button.c:112
-msgid "1s"
-msgstr "1s"
+msgid "750ms"
+msgstr "750 ms"
 
 #: ../src/settings-tool-button.c:113
-msgid "2s"
-msgstr "2s"
+msgid "1s"
+msgstr "1 s"
 
 #: ../src/settings-tool-button.c:114
-msgid "5s"
-msgstr "5s"
+msgid "2s"
+msgstr "2 s"
 
 #: ../src/settings-tool-button.c:115
-msgid "10s"
-msgstr "10s"
+msgid "5s"
+msgstr "5 s"
 
-#: ../src/settings-tool-button.c:164
+#: ../src/settings-tool-button.c:116
+msgid "10s"
+msgstr "10 s"
+
+#: ../src/settings-tool-button.c:165
 msgid "Show all processes"
 msgstr "Zobraziť všetky procesy"
 
-#: ../src/settings-tool-button.c:167
+#: ../src/settings-tool-button.c:168
 msgid "Refresh rate"
-msgstr "Obnovovacia frekvencia"
+msgstr "Rýchlosť obnovovania"
 
-#: ../src/settings-tool-button.c:177
+#: ../src/settings-tool-button.c:178
 msgid "Virtual Bytes"
 msgstr "Virtuálne bajty"
 
-#: ../src/settings-tool-button.c:178
+#: ../src/settings-tool-button.c:179
 msgid "Private Bytes"
 msgstr "Súkromné bajty"
 
-#: ../src/task-manager.c:229
-#, c-format
-msgid "%lu MiB"
-msgstr "%lu MiB"
-
-#: ../src/task-manager.c:236
-#, c-format
-msgid "%lu KiB"
-msgstr "%lu KiB"
-
-#: ../src/task-manager.c:240
-#, c-format
-msgid "%lu B"
-msgstr "%lu B"
-
-#: ../src/task-manager.c:263
+#: ../src/task-manager.c:241
 #, c-format
 msgid "%s%%"
-msgstr " %s%%"
-
+msgstr "%s%%"