diff --git a/po/vi.po b/po/vi.po
index 19fff93..4a00e5f 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1,279 +1,354 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
-# Nguyễn Quốc Vinh <kureikain@gmail.com>, 2009.
-# Phan Vĩnh Thịnh <teppi@vnlinux.org>, 2006.
-#
+# 
+# Translators:
+# truongap <truongap.ars@gmail.com>, 2014
+# Nguyễn Quốc Vinh <kureikain@gmail.com>, 2009
+# Phan Vĩnh Thịnh <teppi@vnlinux.org>, 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-05-10 23:04+0200\n"
-"PO-Revision-Date: 2008-07-31 01:01+0200\n"
-"Last-Translator: Nguyễn Quốc Vinh <kureikain@gmail.com>\n"
-"Language-Team: Vietnamese <none@li.org>\n"
+"POT-Creation-Date: 2013-07-03 20:41+0200\n"
+"PO-Revision-Date: 2014-05-08 01:55+0000\n"
+"Last-Translator: truongap <truongap.ars@gmail.com>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/xfce-apps/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../xfce4-taskmanager.desktop.in.h:1 ../src/process-window.c:326
-#, fuzzy
-msgid "Easy to use task manager"
-msgstr "Xfce4-Taskmanager là một trình quản lý tác vụ dễ dùng"
-
-#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-tree-view.c:215
-#: ../src/process-tree-view.c:229 ../src/process-tree-view.c:247
-#: ../src/process-window.c:199 ../src/process-window.c:321
-#, fuzzy
+#: ../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
 msgid "Task Manager"
-msgstr "xfce4-taskmanager"
+msgstr "Quản lý tác vụ"
 
-#: ../src/process-statusbar.c:121
+#: ../xfce4-taskmanager.desktop.in.h:2 ../src/process-window.c:309
+msgid "Easy to use task manager"
+msgstr "Trình quản lý tác vụ dễ dùng"
+
+#: ../src/exec-tool-button.c:87 ../src/exec-tool-button.c:131
+msgid "Execution error"
+msgstr "Lỗi thực thi"
+
+#: ../src/exec-tool-button.c:133
+msgid "Couldn't find any default command to run."
+msgstr "Không thể tìm thấy bất cứ lệnh mặc định nào để chạy"
+
+#: ../src/exec-tool-button.c:164
+msgid "Run Task Manager as root"
+msgstr "Chạy trình quản lý tác vụ với root"
+
+#: ../src/exec-tool-button.c:175 ../src/exec-tool-button.c:177
+#: ../src/exec-tool-button.c:179
+msgid "Run Program..."
+msgstr "Chạy chương trình"
+
+#: ../src/exec-tool-button.c:182
+msgid "Application Finder"
+msgstr "Tìm kiếm ứng dụng"
+
+#: ../src/exec-tool-button.c:185
+msgid "Terminal emulator"
+msgstr "Giả lập dòng lệnh"
+
+#: ../src/exec-tool-button.c:187
+msgid "XTerm"
+msgstr "Xterm"
+
+#: ../src/main.c:100
 #, c-format
-msgid "CPU: %.2f%%"
+msgid ""
+"<b>Processes:</b> %u\n"
+"<b>CPU:</b> %.0f%%\n"
+"<b>Memory:</b> %.0f%%\n"
+"<b>Swap:</b> %.0f%%"
+msgstr "<b>Tiến trình:</b> %u\n<b>CPU:</b> %.0f%%\n<b>Ram:</b> %.0f%%\n<b>Swap:</b> %.0f%%"
+
+#: ../src/main.c:108
+#, c-format
+msgid ""
+"Processes: %u\n"
+"CPU: %.0f%%\n"
+"Memory: %.0f%%\n"
+"Swap: %.0f%%"
+msgstr "Tiến trình: %u\nCPU: %.0f%%\nRam: %.0f%%\nSwap: %.0f%%"
+
+#: ../src/process-statusbar.c:148 ../src/process-window.c:374
+#, c-format
+msgid "CPU: %s%%"
 msgstr ""
 
-#: ../src/process-statusbar.c:128
+#: ../src/process-statusbar.c:157 ../src/process-window.c:379
 #, c-format
-msgid "Memory: %.2f%%"
+msgid "Memory: %s%%"
+msgstr "Ram: %s%%"
+
+#: ../src/process-statusbar.c:166
+#, c-format
+msgid "Swap: %s%%"
 msgstr ""
 
-#: ../src/process-statusbar.c:135
-#, c-format
-msgid "Swap: %.2f%%"
-msgstr ""
-
-#: ../src/process-statusbar.c:142
+#: ../src/process-statusbar.c:181
 #, c-format
 msgid "Processes: %d"
-msgstr ""
+msgstr "Tiến trình: %d"
 
-#: ../src/process-tree-view.c:106
+#: ../src/process-tree-view.c:125
 msgid "Task"
-msgstr ""
+msgstr "Tác vụ"
 
-#: ../src/process-tree-view.c:116 ../src/process-window.c:276
+#: ../src/process-tree-view.c:136 ../src/settings-tool-button.c:174
 msgid "PID"
 msgstr "PID"
 
-#: ../src/process-tree-view.c:124 ../src/process-window.c:277
+#: ../src/process-tree-view.c:144 ../src/settings-tool-button.c:175
 msgid "PPID"
 msgstr "PPID"
 
-#: ../src/process-tree-view.c:132 ../src/process-window.c:278
+#: ../src/process-tree-view.c:152 ../src/settings-tool-button.c:176
 msgid "State"
 msgstr "Trạng thái"
 
-#: ../src/process-tree-view.c:141
+#: ../src/process-tree-view.c:161
 msgid "VSZ"
 msgstr ""
 
-#: ../src/process-tree-view.c:149
+#: ../src/process-tree-view.c:169
 msgid "RSS"
 msgstr "RSS"
 
-#: ../src/process-tree-view.c:157 ../src/process-window.c:281
-#, fuzzy
+#: ../src/process-tree-view.c:177 ../src/settings-tool-button.c:179
 msgid "UID"
-msgstr "PID"
+msgstr ""
 
-#: ../src/process-tree-view.c:165 ../src/process-window.c:282
+#: ../src/process-tree-view.c:185 ../src/settings-tool-button.c:180
 msgid "CPU"
 msgstr ""
 
-#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view header.
-#: ../src/process-tree-view.c:174
-#, fuzzy
+#. TRANSLATORS: “Prio.” is short for Priority, it appears in the tree view
+#. header.
+#: ../src/process-tree-view.c:194
 msgid "Prio."
-msgstr "Ưu tiên trước"
+msgstr "Ưu tiên"
 
-#: ../src/process-tree-view.c:212
-#, fuzzy
+#: ../src/process-tree-view.c:352
 msgid "Terminate task"
-msgstr "Thực sự muốn chấm dứt tác vụ?"
+msgstr ""
 
-#: ../src/process-tree-view.c:212
-#, fuzzy
+#: ../src/process-tree-view.c:352
 msgid "Kill task"
-msgstr "Diệt"
+msgstr ""
 
-#: ../src/process-tree-view.c:214
+#: ../src/process-tree-view.c:354
 #, c-format
 msgid "Are you sure you want to send a signal to the PID %d?"
 msgstr ""
 
-#: ../src/process-tree-view.c:225
+#: ../src/process-tree-view.c:366
 msgid "Error sending signal"
 msgstr ""
 
-#: ../src/process-tree-view.c:227
+#: ../src/process-tree-view.c:368
 #, 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."
+"An error was encountered by sending a signal to the PID %d. It is likely you"
+" don't have the required privileges."
 msgstr ""
 
-#: ../src/process-tree-view.c:244
+#: ../src/process-tree-view.c:395
 msgid "Error setting priority"
 msgstr ""
 
-#: ../src/process-tree-view.c:245
+#: ../src/process-tree-view.c:396
 #, 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 ""
 
-#: ../src/process-tree-view.c:260
-#, fuzzy
+#: ../src/process-tree-view.c:412
 msgid "Terminate"
-msgstr "Thoát"
+msgstr ""
 
-#: ../src/process-tree-view.c:267
+#: ../src/process-tree-view.c:420
 msgid "Stop"
 msgstr "Dừng"
 
-#: ../src/process-tree-view.c:274
+#: ../src/process-tree-view.c:427
 msgid "Continue"
 msgstr "Tiếp tục"
 
-#: ../src/process-tree-view.c:280
+#: ../src/process-tree-view.c:433
 msgid "Kill"
 msgstr "Diệt"
 
-#: ../src/process-tree-view.c:287
+#: ../src/process-tree-view.c:440
 msgid "Very low"
-msgstr ""
+msgstr "Rất thấp"
 
-#: ../src/process-tree-view.c:292
+#: ../src/process-tree-view.c:445
 msgid "Low"
-msgstr ""
+msgstr "Thấp"
 
-#: ../src/process-tree-view.c:297
+#: ../src/process-tree-view.c:450
 msgid "Normal"
-msgstr ""
+msgstr "Thường"
 
-#: ../src/process-tree-view.c:302
+#: ../src/process-tree-view.c:455
 msgid "High"
-msgstr ""
+msgstr "Cao"
 
-#: ../src/process-tree-view.c:307
+#: ../src/process-tree-view.c:460
 msgid "Very high"
-msgstr ""
+msgstr "Rất cao"
 
-#: ../src/process-tree-view.c:312 ../src/process-window.c:283
+#: ../src/process-tree-view.c:465 ../src/settings-tool-button.c:181
 msgid "Priority"
-msgstr "Ưu tiên trước"
+msgstr "Độ ưu tiên"
 
-#: ../src/process-window.c:197
-msgid "Execution error"
+#: ../src/process-window.c:312
+msgid "translator-credits"
+msgstr "giới thiêu người dịch"
+
+#: ../src/process-window.ui.h:2
+msgid "Warning, you are using the root account, you may harm your system."
+msgstr "Cảnh báo, bạn đang sử dụng tài khoản root, bạn có thể gây hại cho hệ thống."
+
+#: ../src/settings.c:378
+msgid "Default"
+msgstr "Mặc định"
+
+#: ../src/settings.c:379
+msgid "Small"
+msgstr "Nhỏ"
+
+#: ../src/settings.c:380
+msgid "Large"
+msgstr "Lớn"
+
+#: ../src/settings.c:381
+msgid "Text"
+msgstr "Chữ"
+
+#: ../src/settings-dialog.ui.h:1
+msgid "Settings for Task Manager"
+msgstr "Cài đặt cho trình quản lý tác vụ"
+
+#: ../src/settings-dialog.ui.h:2
+msgid "Show application icons"
+msgstr "Hiện biểu tượng ứng dụng"
+
+#: ../src/settings-dialog.ui.h:3
+msgid "Show full command lines"
+msgstr "Hiện toàn bộ dòng lệnh"
+
+#: ../src/settings-dialog.ui.h:4
+msgid "Show values with more precision"
 msgstr ""
 
-#: ../src/process-window.c:226
-msgid "Run Program..."
+#: ../src/settings-dialog.ui.h:5
+msgid "Draw borders around monitors"
 msgstr ""
 
-#: ../src/process-window.c:227
-msgid "Application Finder"
+#: ../src/settings-dialog.ui.h:6
+msgid "Toolbar style:"
 msgstr ""
 
-#: ../src/process-window.c:228
-#, fuzzy
-msgid "Terminal emulator"
-msgstr "Tác giả gốc:"
+#: ../src/settings-dialog.ui.h:7
+msgid "<b>Interface style</b>"
+msgstr ""
 
-#: ../src/process-window.c:229
-#, fuzzy
-msgid "XTerm"
-msgstr "Thoát"
+#: ../src/settings-dialog.ui.h:8
+msgid "Prompt for terminating tasks"
+msgstr ""
 
-#: ../src/process-window.c:271
-#, fuzzy
+#: ../src/settings-dialog.ui.h:9
+msgid "Hide into the notification area"
+msgstr ""
+
+#: ../src/settings-dialog.ui.h:10
+msgid "<b>Miscellaneous</b>"
+msgstr ""
+
+#: ../src/settings-dialog.ui.h:11
+msgid "Refresh rate:"
+msgstr "Tốc độ làm tươi:"
+
+#: ../src/settings-dialog.ui.h:12
+msgid "Columns:"
+msgstr "Cột:"
+
+#: ../src/settings-dialog.ui.h:13
+msgid "<b>Information</b>"
+msgstr "<b>Thông tin</b>"
+
+#: ../src/settings-dialog.ui.h:14
+msgid "Settings"
+msgstr "Cài đặt"
+
+#. TRANSLATORS: The next values are in seconds or milliseconds
+#: ../src/settings-tool-button.c:110
+msgid "500ms"
+msgstr ""
+
+#: ../src/settings-tool-button.c:111
+msgid "750ms"
+msgstr ""
+
+#: ../src/settings-tool-button.c:112
+msgid "1s"
+msgstr ""
+
+#: ../src/settings-tool-button.c:113
+msgid "2s"
+msgstr ""
+
+#: ../src/settings-tool-button.c:114
+msgid "5s"
+msgstr ""
+
+#: ../src/settings-tool-button.c:115
+msgid "10s"
+msgstr ""
+
+#: ../src/settings-tool-button.c:164
 msgid "Show all processes"
-msgstr "Điểu khiển các tiến trình hiện tại"
+msgstr "Hiện mọi tiến trình"
 
-#: ../src/process-window.c:279
+#: ../src/settings-tool-button.c:167
+msgid "Refresh rate"
+msgstr "Tốc độ làm tươi"
+
+#: ../src/settings-tool-button.c:177
 msgid "Virtual Bytes"
 msgstr ""
 
-#: ../src/process-window.c:280
+#: ../src/settings-tool-button.c:178
 msgid "Private Bytes"
 msgstr ""
 
-#: ../src/process-window.c:329
-msgid "translator-credits"
-msgstr "Nguyễn Quốc VInhPhan Vĩnh Thịnh"
-
-#: ../src/task-manager.c:146
+#: ../src/task-manager.c:229
 #, c-format
 msgid "%lu MiB"
 msgstr ""
 
-#: ../src/task-manager.c:153
+#: ../src/task-manager.c:236
 #, c-format
 msgid "%lu KiB"
 msgstr ""
 
-#: ../src/task-manager.c:157
+#: ../src/task-manager.c:240
 #, c-format
 msgid "%lu B"
 msgstr ""
 
-#. TODO make precision optional
-#: ../src/task-manager.c:168
+#: ../src/task-manager.c:263
 #, c-format
-msgid "%.2f%%"
+msgid "%s%%"
 msgstr ""
-
-#~ msgid "Control your processes"
-#~ msgstr "Điểu khiển các tiến trình hiện tại"
-
-#, fuzzy
-#~ msgid "Process manager"
-#~ msgstr "xfce4-taskmanager"
-
-#, fuzzy
-#~ msgid "Xfce4 Taskmanager"
-#~ msgstr "xfce4-taskmanager"
-
-#~ msgid "Really kill the task?"
-#~ msgstr "Thực sự muốn huỷ tác vụ"
-
-#~ msgid "%d MB of %d MB used"
-#~ msgstr "%d MB of %d MB đã sử dụng"
-
-#~ msgid "Cpu usage"
-#~ msgstr "Tài nguyên CPU"
-
-#~ msgid "Memory usage"
-#~ msgstr "Lượng bộ nhớ"
-
-#~ msgid "Command"
-#~ msgstr "Câu lệnh"
-
-#~ msgid "VM-Size"
-#~ msgstr "Kích cỡ-VM"
-
-#~ msgid "User"
-#~ msgstr "Người dùng"
-
-#~ msgid "Show user tasks"
-#~ msgstr "Hiển thị các tác vụ người dùng"
-
-#~ msgid "Show root tasks"
-#~ msgstr "Hiển thị các tác vụ của root"
-
-#~ msgid "Show other tasks"
-#~ msgstr "Hiển thị những tác vụ khác"
-
-#~ msgid "Show memory used by cache as free"
-#~ msgstr "Hiển thị bộ nhớ được dùng cho cache như bộ nhớ trống"
-
-#~ msgid "Contributors:"
-#~ msgstr "Nhà phân phối:"
-
-#~ msgid "xfce4-taskmanager"
-#~ msgstr "xfce4-taskmanager"
-
-#~ msgid "more details"
-#~ msgstr "chi tiết hơn"