diff --git a/po/ca.po b/po/ca.po
index 974fd65..ab1f4ac 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,413 +1,354 @@
-# Catalan translation of xfce4-taskmanager.
-# Copyright (C) 2005, 2006 Johannes Zellner
-# This file is distributed under the same license as the xfce4-taskmanager package.
-# Pau Ruŀlan Ferragut <paurullan@bulma.net>, 2006.
-# Carles Muñoz Gorriz <carlesmu@internautas.org>, 2008.
-# 
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
+# Carles Muñoz Gorriz <carlesmu@internautas.org>, 2008
+# Pau Ruŀlan Ferragut <paurullan@bulma.net>, 2006
 msgid ""
 msgstr ""
-"Project-Id-Version: xfce4-taskmanager 0.4.0-rc1\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-04 11:12+0000\n"
-"PO-Revision-Date: 2008-11-16 14:35+0100\n"
-"Last-Translator: Carles Muñoz Gorriz <carlesmu@internautas.org>\n"
-"Language-Team: Catalan\n"
+"POT-Creation-Date: 2014-12-20 00:31+0100\n"
+"PO-Revision-Date: 2015-12-15 17:25+0000\n"
+"Last-Translator: Xfce Bot <transifex@xfce.org>\n"
+"Language-Team: Catalan (http://www.transifex.com/xfce/xfce-apps/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:309
-msgid "Easy to use task manager"
-msgstr "Gestor de tasques fàcil d'usar"
-
-#: ../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:389 ../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 "Gestor de processos"
 
-#: ../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 "Gestor de tasques fàcil d'usar"
+
+#: ../src/exec-tool-button.c:104 ../src/exec-tool-button.c:148
 msgid "Execution error"
 msgstr "Error d'execució"
 
-#: ../src/exec-tool-button.c:133
+#: ../src/exec-tool-button.c:150
 msgid "Couldn't find any default command to run."
 msgstr "No s'ha pogut trobar una comanda per defecte per a executar."
 
-#: ../src/exec-tool-button.c:164
+#: ../src/exec-tool-button.c:181
 msgid "Run Task Manager as root"
 msgstr "Executar el Gestor de Tasques com a 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 "Executar el programa..."
 
-#: ../src/exec-tool-button.c:182
+#: ../src/exec-tool-button.c:199
 msgid "Application Finder"
 msgstr "Buscador d'aplicacions"
 
-#: ../src/exec-tool-button.c:185
+#: ../src/exec-tool-button.c:202
 msgid "Terminal emulator"
 msgstr "Emulador de terminal"
 
-#: ../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%%"
+"<b>Memory:</b> %s\n"
+"<b>Swap:</b> %s"
 msgstr ""
-"<b>Processos:</b> %u\n"
-"<b>CPU:</b> %.0f%%\n"
-"<b>Memòria:</b> %.0f%%\n"
-"<b>Espai d'intercanvi:</b> %.0f%%"
 
-#: ../src/main.c:108
+#: ../src/main.c:134
 #, c-format
 msgid ""
 "Processes: %u\n"
 "CPU: %.0f%%\n"
-"Memory: %.0f%%\n"
-"Swap: %.0f%%"
+"Memory: %s\n"
+"Swap: %s"
 msgstr ""
-"Processos: %u\n"
-"CPU: %.0f%%\n"
-"Memòria: %.0f%%\n"
-"Espai d'intercanvi: %.0f%%"
 
-#: ../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 "Memòria:  %s%%"
+msgid "Memory: %s"
+msgstr ""
 
-#: ../src/process-statusbar.c:166
+#: ../src/process-statusbar.c:176
 #, c-format
-msgid "Swap: %s%%"
-msgstr "Espai d'intercanvi: %s%%"
+msgid "Swap: %s"
+msgstr ""
 
-#: ../src/process-statusbar.c:181
+#: ../src/process-statusbar.c:190
 #, c-format
 msgid "Processes: %d"
 msgstr "Processos: %d"
 
-#: ../src/process-tree-view.c:125
+#: ../src/process-tree-view.c:136
 msgid "Task"
 msgstr "Tasca"
 
-#: ../src/process-tree-view.c:136 ../src/settings-tool-button.c:174
+#: ../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 "Estat"
 
-#: ../src/process-tree-view.c:161
+#: ../src/process-tree-view.c:172
 msgid "VSZ"
 msgstr "Tamany virtual"
 
-#: ../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
+#: ../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 "Finalitzar la tasca"
 
-#: ../src/process-tree-view.c:352
+#: ../src/process-tree-view.c:369
 msgid "Kill task"
 msgstr "Matar la tasca (KILL)"
 
-#: ../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 "Esteu segur que voleu enviar un senyal al PID %d?"
 
-#: ../src/process-tree-view.c:366
+#: ../src/process-tree-view.c:383
 msgid "Error sending signal"
 msgstr "Error enviant el senyal"
 
-#: ../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."
+msgid ""
+"An error was encountered by sending a signal to the PID %d. It is likely you"
+" don't have the required privileges."
 msgstr "S'ha trobat un error a l'enviar un senyal al procés %d. Comproveu que teniu els privilegis necessaris."
 
-#: ../src/process-tree-view.c:386
+#: ../src/process-tree-view.c:412
 msgid "Error setting priority"
 msgstr "No s'ha pogut establir la prioritat"
 
-#: ../src/process-tree-view.c:387
+#: ../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."
+msgid ""
+"An error was encountered by setting a priority to the PID %d. It is likely "
+"you don't have the required privileges."
 msgstr "S'ha trobat un error en canviar la prioritat del procés %d. Comproveu que teniu els privilegis necessaris."
 
-#: ../src/process-tree-view.c:403
+#: ../src/process-tree-view.c:429
 msgid "Terminate"
 msgstr "Acabar la tasca (TERM)"
 
-#: ../src/process-tree-view.c:410
+#: ../src/process-tree-view.c:437
 msgid "Stop"
 msgstr "Atura (STOP)"
 
-#: ../src/process-tree-view.c:417
+#: ../src/process-tree-view.c:444
 msgid "Continue"
 msgstr "Continua (CONT)"
 
-#: ../src/process-tree-view.c:423
+#: ../src/process-tree-view.c:450
 msgid "Kill"
 msgstr "Mata (KILL)"
 
-#: ../src/process-tree-view.c:430
+#: ../src/process-tree-view.c:457
 msgid "Very low"
 msgstr "Molt baixa"
 
-#: ../src/process-tree-view.c:435
+#: ../src/process-tree-view.c:462
 msgid "Low"
 msgstr "Baixa"
 
-#: ../src/process-tree-view.c:440
+#: ../src/process-tree-view.c:467
 msgid "Normal"
 msgstr "Normal"
 
-#: ../src/process-tree-view.c:445
+#: ../src/process-tree-view.c:472
 msgid "High"
 msgstr "Alta"
 
-#: ../src/process-tree-view.c:450
+#: ../src/process-tree-view.c:477
 msgid "Very high"
 msgstr "Molt alta"
 
-#: ../src/process-tree-view.c:455 ../src/settings-tool-button.c:181
+#: ../src/process-tree-view.c:482 ../src/settings-tool-button.c:182
 msgid "Priority"
 msgstr "Prioritat"
 
-#: ../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 ""
+
+#: ../src/process-window.c:215
+msgid "Filter on process name"
+msgstr ""
+
+#: ../src/process-window.c:399
 msgid "translator-credits"
 msgstr "Pau Ruŀlan Ferragut"
 
-#: ../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 "Atenció!, esteu usant la conta de root, això podria malmetre el vostre sistema."
 
-#: ../src/settings.c:378
+#: ../src/settings.c:387
 msgid "Default"
 msgstr "Defecte"
 
-#: ../src/settings.c:379
+#: ../src/settings.c:388
 msgid "Small"
 msgstr "Petit"
 
-#: ../src/settings.c:380
+#: ../src/settings.c:389
 msgid "Large"
 msgstr "Gran"
 
-#: ../src/settings.c:381
+#: ../src/settings.c:390
 msgid "Text"
 msgstr "Text"
 
-#: ../src/settings-dialog.ui.h:1
-msgid "<b>Information</b>"
-msgstr "<b>Informació</b>"
-
-#: ../src/settings-dialog.ui.h:2
-msgid "<b>Interface style</b>"
-msgstr "<b>Estil d'interfície</b>"
-
-#: ../src/settings-dialog.ui.h:3
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>Miscel·lània</b>"
-
-#: ../src/settings-dialog.ui.h:4
-msgid "Columns:"
-msgstr "Columnes:"
-
-#: ../src/settings-dialog.ui.h:5
-msgid "Draw borders around monitors"
-msgstr "Dibuixa marcs als monitors"
-
-#: ../src/settings-dialog.ui.h:6
-msgid "Hide into the notification area"
-msgstr "Ocultar a l'àrea de notificació"
-
-#: ../src/settings-dialog.ui.h:7
-msgid "Prompt for terminating tasks"
-msgstr "Pregunta per a finalitzar tasques"
-
-#: ../src/settings-dialog.ui.h:8
-msgid "Refresh rate:"
-msgstr "Freqüència de refresc:"
-
-#: ../src/settings-dialog.ui.h:9
-msgid "Settings"
-msgstr "Propietats"
-
-#: ../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 "Propietats per al gestor de tasques"
 
-#: ../src/settings-dialog.ui.h:11
+#: ../src/settings-dialog.ui.h:2 ../src/settings-dialog-gtk3.ui.h:2
 msgid "Show application icons"
 msgstr "Mostrar icones de l'aplicació"
 
-#: ../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 "Mostra la línia de comandes completa"
 
-#: ../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 "Mostra els valors amb més precisió"
 
-#: ../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 ""
+
+#: ../src/settings-dialog.ui.h:6 ../src/settings-dialog-gtk3.ui.h:6
+msgid "Show memory usage in bytes"
+msgstr ""
+
+#: ../src/settings-dialog.ui.h:7 ../src/settings-dialog-gtk3.ui.h:7
 msgid "Toolbar style:"
 msgstr "Estil de la barra d'eines:"
 
+#: ../src/settings-dialog.ui.h:8 ../src/settings-dialog-gtk3.ui.h:8
+msgid "<b>Interface style</b>"
+msgstr "<b>Estil d'interfície</b>"
+
+#: ../src/settings-dialog.ui.h:9 ../src/settings-dialog-gtk3.ui.h:9
+msgid "Prompt for terminating tasks"
+msgstr "Pregunta per a finalitzar tasques"
+
+#: ../src/settings-dialog.ui.h:10 ../src/settings-dialog-gtk3.ui.h:10
+msgid "Hide into the notification area"
+msgstr "Ocultar a l'àrea de notificació"
+
+#: ../src/settings-dialog.ui.h:11 ../src/settings-dialog-gtk3.ui.h:11
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Miscel·lània</b>"
+
+#: ../src/settings-dialog.ui.h:12 ../src/settings-dialog-gtk3.ui.h:12
+msgid "Refresh rate:"
+msgstr "Freqüència de refresc:"
+
+#: ../src/settings-dialog.ui.h:13 ../src/settings-dialog-gtk3.ui.h:13
+msgid "Columns:"
+msgstr "Columnes:"
+
+#: ../src/settings-dialog.ui.h:14 ../src/settings-dialog-gtk3.ui.h:14
+msgid "<b>Information</b>"
+msgstr "<b>Informació</b>"
+
+#: ../src/settings-dialog.ui.h:15 ../src/settings-dialog-gtk3.ui.h:15
+msgid "Settings"
+msgstr "Propietats"
+
 #. TRANSLATORS: The next values are in seconds or milliseconds
-#: ../src/settings-tool-button.c:110
+#: ../src/settings-tool-button.c:111
 msgid "500ms"
 msgstr "500ms"
 
-#: ../src/settings-tool-button.c:111
+#: ../src/settings-tool-button.c:112
 msgid "750ms"
 msgstr "750ms"
 
-#: ../src/settings-tool-button.c:112
+#: ../src/settings-tool-button.c:113
 msgid "1s"
 msgstr "1s"
 
-#: ../src/settings-tool-button.c:113
+#: ../src/settings-tool-button.c:114
 msgid "2s"
 msgstr "2s"
 
-#: ../src/settings-tool-button.c:114
+#: ../src/settings-tool-button.c:115
 msgid "5s"
 msgstr "5s"
 
-#: ../src/settings-tool-button.c:115
+#: ../src/settings-tool-button.c:116
 msgid "10s"
 msgstr "10s"
 
-#: ../src/settings-tool-button.c:164
+#: ../src/settings-tool-button.c:165
 msgid "Show all processes"
 msgstr "Mostra tots els processos"
 
-#: ../src/settings-tool-button.c:167
+#: ../src/settings-tool-button.c:168
 msgid "Refresh rate"
 msgstr "Freqüència de refresc"
 
-#: ../src/settings-tool-button.c:177
+#: ../src/settings-tool-button.c:178
 msgid "Virtual Bytes"
 msgstr "Bytes virtuals"
 
-#: ../src/settings-tool-button.c:178
+#: ../src/settings-tool-button.c:179
 msgid "Private Bytes"
 msgstr "Bytes privats"
 
-#: ../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%%"
-
-#~ msgid "More precision"
-#~ msgstr "Més precisió"
-
-#~ msgid "Show status icon"
-#~ msgstr "Mostra icona d'estat"
-
-#~ msgid "250ms"
-#~ msgstr "250ms"
-
-#~ msgid "Control your processes"
-#~ msgstr "Controla els processos"
-
-#~ msgid "Process manager"
-#~ msgstr "Gestor de processos"
-
-#~ msgid "Xfce4 Taskmanager"
-#~ msgstr "Gestor de processos de Xfce4"
-
-#~ msgid "Really kill the task?"
-#~ msgstr "Voleu matar aquesta tasca?"
-
-#~ msgid "%d MB of %d MB used"
-#~ msgstr "%d MB de %d MB emprades"
-
-#~ msgid "Cpu usage"
-#~ msgstr "Ús de cpu"
-
-#~ msgid "Memory usage"
-#~ msgstr "Ús de memòria"
-
-#~ msgid "Command"
-#~ msgstr "Ordre"
-
-#~ msgid "VM-Size"
-#~ msgstr "Mida de la memòria virtual"
-
-#~ msgid "User"
-#~ msgstr "Usuari"
-
-#~ msgid "Show user tasks"
-#~ msgstr "Mostra tasques d’usuari"
-
-#~ msgid "Show root tasks"
-#~ msgstr "Mostra tasques de superusuari"
-
-#~ msgid "Show other tasks"
-#~ msgstr "Mostra altres tasques"
-
-#~ msgid "Show memory used by cache as free"
-#~ msgstr "Mostra com a lliure la memòria emprada per la memòria cau"
-
-#~ msgid "Contributors:"
-#~ msgstr "Contribuïdors:"
-
-#~ msgid "more details"
-#~ msgstr "més detalls"