diff --git a/po/zh_HK.po b/po/zh_HK.po
index eb5fcb7..029fdeb 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -9,345 +9,388 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-03 20:41+0200\n"
-"PO-Revision-Date: 2013-12-25 02:57+0000\n"
-"Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\n"
-"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/xfce/language/zh_HK/)\n"
+"POT-Creation-Date: 2017-01-27 00:30+0100\n"
+"PO-Revision-Date: 2017-09-19 20:16+0000\n"
+"Last-Translator: Xfce Bot <transifex@xfce.org>\n"
+"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/xfce/xfce-apps/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../xfce4-taskmanager.desktop.in.h:1 ../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:374 ../src/process-tree-view.c:389
+#: ../src/process-tree-view.c:417 ../src/process-window.c:500
+#: ../src/process-window.ui.h:1 ../src/process-window-gtk3.ui.h:1
 msgid "Task Manager"
 msgstr "工作管理員"
 
-#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-window.c:309
+#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-window.c:507
 msgid "Easy to use task manager"
 msgstr "易用的工作管理員"
 
-#: ../src/exec-tool-button.c:87 ../src/exec-tool-button.c:131
+#: ../src/exec-tool-button.c:104 ../src/exec-tool-button.c:148
 msgid "Execution error"
 msgstr "執行發生錯誤"
 
-#: ../src/exec-tool-button.c:133
+#: ../src/exec-tool-button.c:150
 msgid "Couldn't find any default command to run."
 msgstr "找不到任何預設指令可執行。"
 
-#: ../src/exec-tool-button.c:164
+#: ../src/exec-tool-button.c:181
 msgid "Run Task Manager as root"
 msgstr "以 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 "執行程式..."
 
-#: ../src/exec-tool-button.c:182
+#: ../src/exec-tool-button.c:199
 msgid "Application Finder"
 msgstr "應用程式協尋器"
 
-#: ../src/exec-tool-button.c:185
+#: ../src/exec-tool-button.c:202
 msgid "Terminal emulator"
 msgstr "終端機模擬器"
 
-#: ../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 "<b>進程數：</b> %u\n<b>CPU：</b> %.0f%%\n<b>記憶體：</b> %.0f%%\n<b>置換空間：</b> %.0f%%"
+"<b>Memory:</b> %s\n"
+"<b>Swap:</b> %s"
+msgstr ""
 
-#: ../src/main.c:108
+#: ../src/main.c:134
 #, c-format
 msgid ""
 "Processes: %u\n"
 "CPU: %.0f%%\n"
-"Memory: %.0f%%\n"
-"Swap: %.0f%%"
-msgstr "進程數：%u\nCPU：%.0f%%\n記憶體：%.0f%%\n置換空間：%.0f%%"
+"Memory: %s\n"
+"Swap: %s"
+msgstr ""
 
-#: ../src/process-statusbar.c:148 ../src/process-window.c:374
+#: ../src/process-statusbar.c:147 ../src/process-window.c:572
 #, 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:576
 #, c-format
-msgid "Memory: %s%%"
-msgstr "記憶體：%s%%"
+msgid "Memory: %s"
+msgstr ""
 
-#: ../src/process-statusbar.c:166
+#: ../src/process-statusbar.c:176
 #, c-format
-msgid "Swap: %s%%"
-msgstr "置換空間：%s%%"
+msgid "Swap: %s"
+msgstr ""
 
-#: ../src/process-statusbar.c:181
+#: ../src/process-statusbar.c:190
 #, c-format
 msgid "Processes: %d"
 msgstr "進程數：%d"
 
-#: ../src/process-tree-view.c:125
+#: ../src/process-tree-view.c:137
 msgid "Task"
 msgstr "工作"
 
-#: ../src/process-tree-view.c:136 ../src/settings-tool-button.c:174
+#: ../src/process-tree-view.c:148 ../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:156 ../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:164 ../src/settings-tool-button.c:177
 msgid "State"
 msgstr "狀態"
 
-#: ../src/process-tree-view.c:161
+#: ../src/process-tree-view.c:173
 msgid "VSZ"
 msgstr "VSZ"
 
-#: ../src/process-tree-view.c:169
+#: ../src/process-tree-view.c:181
 msgid "RSS"
 msgstr "RSS"
 
-#: ../src/process-tree-view.c:177 ../src/settings-tool-button.c:179
+#: ../src/process-tree-view.c:189 ../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:197 ../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:206
 msgid "Prio."
 msgstr "優先"
 
-#: ../src/process-tree-view.c:352
+#: ../src/process-tree-view.c:370
 msgid "Terminate task"
 msgstr "終止工作"
 
-#: ../src/process-tree-view.c:352
+#: ../src/process-tree-view.c:370
 msgid "Kill task"
 msgstr "強行中止工作"
 
-#: ../src/process-tree-view.c:354
+#: ../src/process-tree-view.c:372
 #, c-format
-msgid "Are you sure you want to send a signal to the PID %d?"
-msgstr "確定要傳送訊號給 PID %d 嗎？"
+msgid "Are you sure you want to send the %s signal to the PID %d?"
+msgstr ""
 
-#: ../src/process-tree-view.c:366
+#: ../src/process-tree-view.c:373
+msgid "terminate"
+msgstr ""
+
+#: ../src/process-tree-view.c:373
+msgid "kill"
+msgstr ""
+
+#: ../src/process-tree-view.c:385
 msgid "Error sending signal"
 msgstr "傳送訊號時發生錯誤"
 
-#: ../src/process-tree-view.c:368
+#: ../src/process-tree-view.c:387
 #, 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 "傳送訊號給 PID %d 時遭遇錯誤。很可能你沒有應具備的特權。"
 
-#: ../src/process-tree-view.c:395
+#: ../src/process-tree-view.c:414
 msgid "Error setting priority"
 msgstr "設定優先權時發生錯誤"
 
-#: ../src/process-tree-view.c:396
+#: ../src/process-tree-view.c:415
 #, 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 "設定 PID %d 的優先權時遭遇錯誤。很可能你沒有應具備的特權。"
 
-#: ../src/process-tree-view.c:412
-msgid "Terminate"
-msgstr "終止"
-
-#: ../src/process-tree-view.c:420
+#: ../src/process-tree-view.c:433 ../src/process-tree-view.c:584
 msgid "Stop"
 msgstr "停止"
 
-#: ../src/process-tree-view.c:427
+#: ../src/process-tree-view.c:440
 msgid "Continue"
 msgstr "繼續"
 
-#: ../src/process-tree-view.c:433
+#: ../src/process-tree-view.c:446
+msgid "Terminate"
+msgstr "終止"
+
+#: ../src/process-tree-view.c:452
 msgid "Kill"
 msgstr "強行中止"
 
-#: ../src/process-tree-view.c:440
+#: ../src/process-tree-view.c:459
 msgid "Very low"
 msgstr "非常低"
 
-#: ../src/process-tree-view.c:445
+#: ../src/process-tree-view.c:464
 msgid "Low"
 msgstr "低"
 
-#: ../src/process-tree-view.c:450
+#: ../src/process-tree-view.c:469
 msgid "Normal"
 msgstr "正常"
 
-#: ../src/process-tree-view.c:455
+#: ../src/process-tree-view.c:474
 msgid "High"
 msgstr "高"
 
-#: ../src/process-tree-view.c:460
+#: ../src/process-tree-view.c:479
 msgid "Very high"
 msgstr "非常高"
 
-#: ../src/process-tree-view.c:465 ../src/settings-tool-button.c:181
+#: ../src/process-tree-view.c:484 ../src/settings-tool-button.c:182
 msgid "Priority"
 msgstr "優先權"
 
-#: ../src/process-window.c:312
+#: ../src/process-window.c:171
+msgid "Bad Window"
+msgstr ""
+
+#: ../src/process-window.c:171
+#, c-format
+msgid "Window id 0x%lx does not exist!"
+msgstr ""
+
+#: ../src/process-window.c:174
+msgid "XGetWindowProperty failed"
+msgstr ""
+
+#: ../src/process-window.c:174
+msgid "XGetWindowProperty failed!"
+msgstr ""
+
+#: ../src/process-window.c:181
+msgid "No PID found"
+msgstr ""
+
+#: ../src/process-window.c:181
+#, c-format
+msgid "No PID found for window 0x%lx."
+msgstr ""
+
+#: ../src/process-window.c:251
+msgid "Identify Window"
+msgstr ""
+
+#: ../src/process-window.c:252
+msgid "Identify an open window by clicking on it."
+msgstr ""
+
+#: ../src/process-window.c:318
+#, 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:328
+msgid "Filter on process name"
+msgstr ""
+
+#: ../src/process-window.c:510
 msgid "translator-credits"
 msgstr "Cosmo Chene\nCheng-Chia Tseng <pswo10680@gmail.com>, 2012.\nWalter Cheuk <wwycheuk@gmail.com>, 2013."
 
-#: ../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 "警告，你正使用 root 帳號，有可能因此損害系統。"
 
-#: ../src/settings.c:378
+#: ../src/settings.c:387
 msgid "Default"
 msgstr "預設"
 
-#: ../src/settings.c:379
+#: ../src/settings.c:388
 msgid "Small"
 msgstr "小"
 
-#: ../src/settings.c:380
+#: ../src/settings.c:389
 msgid "Large"
 msgstr "大"
 
-#: ../src/settings.c:381
+#: ../src/settings.c:390
 msgid "Text"
 msgstr "文字"
 
-#: ../src/settings-dialog.ui.h:1
+#: ../src/settings-dialog.ui.h:1 ../src/settings-dialog-gtk3.ui.h:1
 msgid "Settings for Task Manager"
 msgstr "工作管理員設定"
 
-#: ../src/settings-dialog.ui.h:2
+#: ../src/settings-dialog.ui.h:2 ../src/settings-dialog-gtk3.ui.h:2
 msgid "Show application icons"
 msgstr "顯示應用程式圖示"
 
-#: ../src/settings-dialog.ui.h:3
+#: ../src/settings-dialog.ui.h:3 ../src/settings-dialog-gtk3.ui.h:3
 msgid "Show full command lines"
 msgstr "顯示完整指令列"
 
-#: ../src/settings-dialog.ui.h:4
+#: ../src/settings-dialog.ui.h:4 ../src/settings-dialog-gtk3.ui.h:4
 msgid "Show values with more precision"
 msgstr "顯示更精準的值"
 
-#: ../src/settings-dialog.ui.h:5
-msgid "Draw borders around monitors"
-msgstr "描繪螢幕周圍邊緣"
+#: ../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.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 "工具列樣式："
 
-#: ../src/settings-dialog.ui.h:7
+#: ../src/settings-dialog.ui.h:8 ../src/settings-dialog-gtk3.ui.h:8
 msgid "<b>Interface style</b>"
 msgstr "<b>資訊樣式</b>"
 
-#: ../src/settings-dialog.ui.h:8
+#: ../src/settings-dialog.ui.h:9 ../src/settings-dialog-gtk3.ui.h:9
 msgid "Prompt for terminating tasks"
 msgstr "提請終止工作"
 
-#: ../src/settings-dialog.ui.h:9
+#: ../src/settings-dialog.ui.h:10 ../src/settings-dialog-gtk3.ui.h:10
 msgid "Hide into the notification area"
 msgstr "隱藏至通知區域"
 
-#: ../src/settings-dialog.ui.h:10
+#: ../src/settings-dialog.ui.h:11 ../src/settings-dialog-gtk3.ui.h:11
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>雜項</b>"
 
-#: ../src/settings-dialog.ui.h:11
+#: ../src/settings-dialog.ui.h:12 ../src/settings-dialog-gtk3.ui.h:12
 msgid "Refresh rate:"
 msgstr "重新整理速率："
 
-#: ../src/settings-dialog.ui.h:12
+#: ../src/settings-dialog.ui.h:13 ../src/settings-dialog-gtk3.ui.h:13
 msgid "Columns:"
 msgstr "欄數："
 
-#: ../src/settings-dialog.ui.h:13
+#: ../src/settings-dialog.ui.h:14 ../src/settings-dialog-gtk3.ui.h:14
 msgid "<b>Information</b>"
 msgstr "<b>資訊</b>"
 
-#: ../src/settings-dialog.ui.h:14
+#: ../src/settings-dialog.ui.h:15 ../src/settings-dialog-gtk3.ui.h:15
 msgid "Settings"
 msgstr "設定"
 
 #. TRANSLATORS: The next values are in seconds or milliseconds
-#: ../src/settings-tool-button.c:110
+#: ../src/settings-tool-button.c:111
 msgid "500ms"
 msgstr "500毫秒"
 
-#: ../src/settings-tool-button.c:111
+#: ../src/settings-tool-button.c:112
 msgid "750ms"
 msgstr "750毫秒"
 
-#: ../src/settings-tool-button.c:112
+#: ../src/settings-tool-button.c:113
 msgid "1s"
 msgstr "1秒"
 
-#: ../src/settings-tool-button.c:113
+#: ../src/settings-tool-button.c:114
 msgid "2s"
 msgstr "2秒"
 
-#: ../src/settings-tool-button.c:114
+#: ../src/settings-tool-button.c:115
 msgid "5s"
 msgstr "5秒"
 
-#: ../src/settings-tool-button.c:115
+#: ../src/settings-tool-button.c:116
 msgid "10s"
 msgstr "10秒"
 
-#: ../src/settings-tool-button.c:164
+#: ../src/settings-tool-button.c:165
 msgid "Show all processes"
 msgstr "顯示所有進程"
 
-#: ../src/settings-tool-button.c:167
+#: ../src/settings-tool-button.c:168
 msgid "Refresh rate"
 msgstr "重新整理速率"
 
-#: ../src/settings-tool-button.c:177
+#: ../src/settings-tool-button.c:178
 msgid "Virtual Bytes"
 msgstr "虛擬位元組"
 
-#: ../src/settings-tool-button.c:178
+#: ../src/settings-tool-button.c:179
 msgid "Private Bytes"
 msgstr "私有位元組"
 
-#: ../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%%"