diff --git a/po/pt.po b/po/pt.po
index 025ed8f..d0374a1 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,54 +1,49 @@
-# european Portuguese translations for xfce4-taskmanager package.
-# Copyright (C) 2005 Johannes Zellner.
-# This file is distributed under the same license as the xfce4-taskmanager package.
-# Nuno Miguel <nunis@netcabo.pt>, 2007.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Nuno Miguel <nunis@netcabo.pt>, 2007
+# Nuno Miguel <nunomgue@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: xfce4-taskmanager\n"
+"Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-04 11:13+0000\n"
-"PO-Revision-Date: 2012-01-17 12:56-0000\n"
-"Last-Translator: Sérgio Marques <smarquespt@gmail.com>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2014-12-05 00:31+0100\n"
+"PO-Revision-Date: 2014-12-05 12:37+0000\n"
+"Last-Translator: Nuno Miguel <nunomgue@gmail.com>\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/xfce-apps/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Portuguese\n"
-"X-Poedit-Country: PORTUGAL\n"
+"Language: pt\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 tarefas fácil de 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
+#: ../xfce4-taskmanager.desktop.in.h:1 ../src/exec-tool-button.c:89
+#: ../src/exec-tool-button.c:134 ../src/main.c:186
+#: ../src/process-tree-view.c:367 ../src/process-tree-view.c:382
+#: ../src/process-tree-view.c:410 ../src/process-window.c:353
 #: ../src/process-window.ui.h:1
 msgid "Task Manager"
 msgstr "Gestor de tarefas"
 
-#: ../src/exec-tool-button.c:87
-#: ../src/exec-tool-button.c:131
+#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-window.c:358
+msgid "Easy to use task manager"
+msgstr "Gestor de tarefas fácil de usar"
+
+#: ../src/exec-tool-button.c:87 ../src/exec-tool-button.c:131
 msgid "Execution error"
 msgstr "Erro de execução"
 
 #: ../src/exec-tool-button.c:133
 msgid "Couldn't find any default command to run."
-msgstr "O comando de execução não foi encontrado"
+msgstr "O comando de execução não foi encontrado."
 
 #: ../src/exec-tool-button.c:164
 msgid "Run Task Manager as root"
-msgstr "Executar gestor de tarefas como \"root\""
+msgstr "Executar gestor de tarefas como root"
 
-#: ../src/exec-tool-button.c:175
-#: ../src/exec-tool-button.c:177
+#: ../src/exec-tool-button.c:175 ../src/exec-tool-button.c:177
 #: ../src/exec-tool-button.c:179
 msgid "Run Program..."
 msgstr "Executar programa..."
@@ -65,307 +60,287 @@ msgstr "Emulador de terminal"
 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 ""
-"<b>Processos:</b> %u\n"
-"<b>CPU:</b> %.0f%%\n"
-"<b>Memória:</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> %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 ""
-"Processos: %u\n"
-"CPU: %.0f%%\n"
-"Memória: %.0f%%\n"
-"Swap: %.0f%%"
+"Memory: %s\n"
+"Swap: %s"
+msgstr "Processos: %u\nCPU: %.0f%%\nMemória: %s\nSwap: %s"
 
-#: ../src/process-statusbar.c:148
-#: ../src/process-window.c:374
+#: ../src/process-statusbar.c:148 ../src/process-window.c:423
 #, c-format
 msgid "CPU: %s%%"
 msgstr "CPU: %s%%"
 
-#: ../src/process-statusbar.c:157
-#: ../src/process-window.c:379
+#: ../src/process-statusbar.c:156 ../src/process-window.c:427
 #, c-format
-msgid "Memory: %s%%"
-msgstr "Memória: %s%%"
+msgid "Memory: %s"
+msgstr "Memória: %s"
 
-#: ../src/process-statusbar.c:166
+#: ../src/process-statusbar.c:163
 #, c-format
-msgid "Swap: %s%%"
-msgstr "Swap: %s%%"
+msgid "Swap: %s"
+msgstr "Swap: %s"
 
-#: ../src/process-statusbar.c:181
+#: ../src/process-statusbar.c:177
 #, c-format
 msgid "Processes: %d"
 msgstr "Processos: %d"
 
-#: ../src/process-tree-view.c:125
+#: ../src/process-tree-view.c:131
 msgid "Task"
 msgstr "Tarefa"
 
-#: ../src/process-tree-view.c:136
-#: ../src/settings-tool-button.c:174
+#: ../src/process-tree-view.c:142 ../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:150 ../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:158 ../src/settings-tool-button.c:177
 msgid "State"
 msgstr "Estado"
 
-#: ../src/process-tree-view.c:161
+#: ../src/process-tree-view.c:167
 msgid "VSZ"
 msgstr "VSZ"
 
-#: ../src/process-tree-view.c:169
+#: ../src/process-tree-view.c:175
 msgid "RSS"
 msgstr "RSS"
 
-#: ../src/process-tree-view.c:177
-#: ../src/settings-tool-button.c:179
+#: ../src/process-tree-view.c:183 ../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:191 ../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:200
 msgid "Prio."
-msgstr "Prioridade"
+msgstr "Prio."
 
-#: ../src/process-tree-view.c:352
+#: ../src/process-tree-view.c:364
 msgid "Terminate task"
 msgstr "Terminar tarefa"
 
-#: ../src/process-tree-view.c:352
+#: ../src/process-tree-view.c:364
 msgid "Kill task"
 msgstr "Matar tarefa"
 
-#: ../src/process-tree-view.c:354
+#: ../src/process-tree-view.c:366
 #, c-format
 msgid "Are you sure you want to send a signal to the PID %d?"
 msgstr "Tem a certeza que pretende enviar um sinal ao PID %d?"
 
-#: ../src/process-tree-view.c:366
+#: ../src/process-tree-view.c:378
 msgid "Error sending signal"
 msgstr "Erro ao enviar o sinal"
 
-#: ../src/process-tree-view.c:368
+#: ../src/process-tree-view.c:380
 #, 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 "Ocorreu um erro ao enviar o sinal ao PID %d. É possível que não tenha os privilégios necessários"
+msgid ""
+"An error was encountered by sending a signal to the PID %d. It is likely you"
+" don't have the required privileges."
+msgstr "Ocorreu um erro ao enviar o sinal ao PID %d. É possível que não tenha os privilégios necessários."
 
-#: ../src/process-tree-view.c:386
+#: ../src/process-tree-view.c:407
 msgid "Error setting priority"
 msgstr "Erro ao definir a prioridade"
 
-#: ../src/process-tree-view.c:387
+#: ../src/process-tree-view.c:408
 #, 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 "Ocorreu um erro ao definir a prioridade para o PID %d. É possível que não tenha os privilégios necessários"
+msgid ""
+"An error was encountered by setting a priority to the PID %d. It is likely "
+"you don't have the required privileges."
+msgstr "Ocorreu um erro ao definir a prioridade para o PID %d. É possível que não tenha os privilégios necessários."
 
-#: ../src/process-tree-view.c:403
+#: ../src/process-tree-view.c:424
 msgid "Terminate"
 msgstr "Terminar"
 
-#: ../src/process-tree-view.c:410
+#: ../src/process-tree-view.c:432
 msgid "Stop"
 msgstr "Parar"
 
-#: ../src/process-tree-view.c:417
+#: ../src/process-tree-view.c:439
 msgid "Continue"
 msgstr "Continuar"
 
-#: ../src/process-tree-view.c:423
+#: ../src/process-tree-view.c:445
 msgid "Kill"
 msgstr "Matar"
 
-#: ../src/process-tree-view.c:430
+#: ../src/process-tree-view.c:452
 msgid "Very low"
 msgstr "Muito baixa"
 
-#: ../src/process-tree-view.c:435
+#: ../src/process-tree-view.c:457
 msgid "Low"
 msgstr "Baixa"
 
-#: ../src/process-tree-view.c:440
+#: ../src/process-tree-view.c:462
 msgid "Normal"
 msgstr "Normal"
 
-#: ../src/process-tree-view.c:445
+#: ../src/process-tree-view.c:467
 msgid "High"
 msgstr "Alta"
 
-#: ../src/process-tree-view.c:450
+#: ../src/process-tree-view.c:472
 msgid "Very high"
 msgstr "Muito alta"
 
-#: ../src/process-tree-view.c:455
-#: ../src/settings-tool-button.c:181
+#: ../src/process-tree-view.c:477 ../src/settings-tool-button.c:182
 msgid "Priority"
 msgstr "Prioridade"
 
-#: ../src/process-window.c:312
+#: ../src/process-window.c:361
 msgid "translator-credits"
 msgstr "Nuno Miguel"
 
 #: ../src/process-window.ui.h:2
 msgid "Warning, you are using the root account, you may harm your system."
-msgstr "Cuidado, está a utilizar a conta de \"root\" e pode danificar o seu sistema"
+msgstr "Cuidado, está a utilizar a conta de root e pode danificar o seu sistema."
 
-#: ../src/settings.c:378
+#: ../src/settings.c:384
 msgid "Default"
 msgstr "Omissão"
 
-#: ../src/settings.c:379
+#: ../src/settings.c:385
 msgid "Small"
 msgstr "Pequeno"
 
-#: ../src/settings.c:380
+#: ../src/settings.c:386
 msgid "Large"
 msgstr "Grande"
 
-#: ../src/settings.c:381
+#: ../src/settings.c:387
 msgid "Text"
 msgstr "Texto"
 
 #: ../src/settings-dialog.ui.h:1
-msgid "<b>Information</b>"
-msgstr "<b>Informações</b>"
+msgid "Settings for Task Manager"
+msgstr "Definições do gestor de tarefas"
 
 #: ../src/settings-dialog.ui.h:2
-msgid "<b>Interface style</b>"
-msgstr "<b>Estilo da interface</b>"
+msgid "Show application icons"
+msgstr "Mostrar ícones das aplicações"
 
 #: ../src/settings-dialog.ui.h:3
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>Diversos</b>"
+msgid "Show full command lines"
+msgstr "Mostrar linhas de comando completas"
 
 #: ../src/settings-dialog.ui.h:4
-msgid "Columns:"
-msgstr "Colunas:"
+msgid "Show values with more precision"
+msgstr "Mostrar valores com mais precisão"
 
 #: ../src/settings-dialog.ui.h:5
 msgid "Draw borders around monitors"
 msgstr "Desenhar contornos do monitor"
 
 #: ../src/settings-dialog.ui.h:6
-msgid "Hide into the notification area"
-msgstr "Ocultar na área de notificação"
+msgid "Show processes as tree"
+msgstr "Mostrar processos como árvore"
 
 #: ../src/settings-dialog.ui.h:7
-msgid "Prompt for terminating tasks"
-msgstr "Solicitar pelo término das aplicações"
-
-#: ../src/settings-dialog.ui.h:8
-msgid "Refresh rate:"
-msgstr "Taxa de atualização:"
-
-#: ../src/settings-dialog.ui.h:9
-msgid "Settings"
-msgstr "Definições"
-
-#: ../src/settings-dialog.ui.h:10
-msgid "Settings for Task Manager"
-msgstr "Definições do gestor de tarefas"
-
-#: ../src/settings-dialog.ui.h:11
-msgid "Show application icons"
-msgstr "Mostrar ícones das aplicações"
-
-#: ../src/settings-dialog.ui.h:12
-msgid "Show full command lines"
-msgstr "Mostrar linhas de comando detalhadas"
-
-#: ../src/settings-dialog.ui.h:13
-msgid "Show values with more precision"
-msgstr "Mostrar valores com mais precisão"
-
-#: ../src/settings-dialog.ui.h:14
 msgid "Toolbar style:"
 msgstr "Estilo da barra de ferramentas:"
 
+#: ../src/settings-dialog.ui.h:8
+msgid "<b>Interface style</b>"
+msgstr "<b>Estilo da interface</b>"
+
+#: ../src/settings-dialog.ui.h:9
+msgid "Prompt for terminating tasks"
+msgstr "Solicitar pelo término das aplicações"
+
+#: ../src/settings-dialog.ui.h:10
+msgid "Hide into the notification area"
+msgstr "Ocultar na área de notificação"
+
+#: ../src/settings-dialog.ui.h:11
+msgid "Show memory usage in bytes"
+msgstr "Mostrar memória usada em bytes"
+
+#: ../src/settings-dialog.ui.h:12
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Diversos</b>"
+
+#: ../src/settings-dialog.ui.h:13
+msgid "Refresh rate:"
+msgstr "Taxa de atualização:"
+
+#: ../src/settings-dialog.ui.h:14
+msgid "Columns:"
+msgstr "Colunas:"
+
+#: ../src/settings-dialog.ui.h:15
+msgid "<b>Information</b>"
+msgstr "<b>Informações</b>"
+
+#: ../src/settings-dialog.ui.h:16
+msgid "Settings"
+msgstr "Definições"
+
 #. 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 "Mostrar todos os processos"
 
-#: ../src/settings-tool-button.c:167
+#: ../src/settings-tool-button.c:168
 msgid "Refresh rate"
 msgstr "Taxa de atualização"
 
-#: ../src/settings-tool-button.c:177
+#: ../src/settings-tool-button.c:178
 msgid "Virtual Bytes"
 msgstr "\"Bytes\" virtuais"
 
-#: ../src/settings-tool-button.c:178
+#: ../src/settings-tool-button.c:179
 msgid "Private Bytes"
 msgstr "\"Bytes\" privados"
 
-#: ../src/task-manager.c:229
-#, c-format
-msgid "%lu MiB"
-msgstr "%lu MB"
-
-#: ../src/task-manager.c:236
-#, c-format
-msgid "%lu KiB"
-msgstr "%lu KB"
-
-#: ../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%%"
-