diff --git a/po/ChangeLog b/po/ChangeLog
index ef4a3527e..8ca737799 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-24  Clytie Siddall <clytie@riverland.net.au>
+
+	* vi.po: Updated Vietnamese translation.
+
 2006-02-24  Raphael Higino  <raphaelh@cvs.gnome.org>
 
 	* pt_BR.po: Updated Brazilian Portuguese translation.
@@ -35,7 +39,6 @@
 	* nb.po: Updated Norwegian bokmål translation.
 	* no.po: Same.
 
->>>>>>> 1.1970
 2006-02-19  Takeshi AIHANA <takeshi.aihana@gmail.com>
 
 	* ja.po: Updated Japanese translation.
diff --git a/po/vi.po b/po/vi.po
index f521cb0ae..c94c6a72c 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,8 +7,8 @@ msgid ""
 ""
 msgstr "Project-Id-Version: gnome-control-center for Gnome HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-14 08:14+0100\n"
-"PO-Revision-Date: 2006-02-14 22:09+1030\n"
+"POT-Creation-Date: 2006-02-24 09:20+0100\n"
+"PO-Revision-Date: 2006-02-24 22:04+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -638,6 +638,7 @@ msgid "characters/second"
 msgstr "ký tự/giây"
 
 #:../capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:41
+#:../capplets/mouse/gnome-mouse-properties.glade.h:27
 msgid "milliseconds"
 msgstr "mili giây"
 
@@ -961,7 +962,7 @@ msgid "Could not display help"
 msgstr "Không thể hiển thị trợ giúp"
 
 #:../capplets/default-applications/gnome-da-capplet.c:58
-#:../capplets/default-applications/gnome-da-capplet.c:683
+#:../capplets/default-applications/gnome-da-capplet.c:714
 msgid "Please make sure that the applet is properly installed"
 msgstr "Hãy kiểm tra xem tiểu dụng này đã được cài đặt đúng"
 
@@ -971,17 +972,17 @@ msgstr "Hãy kiểm tra xem tiểu dụng này đã được cài đặt đúng"
 #:../capplets/default-applications/gnome-da-capplet.c:230
 #:../capplets/default-applications/gnome-da-capplet.c:284
 #:../capplets/default-applications/gnome-da-capplet.c:333
-#:../capplets/default-applications/gnome-da-capplet.c:523
-#:../capplets/default-applications/gnome-da-capplet.c:544
+#:../capplets/default-applications/gnome-da-capplet.c:554
+#:../capplets/default-applications/gnome-da-capplet.c:575
 #,c-format
 msgid "Error saving configuration: %s"
 msgstr "Gặp lỗi khi lưu cấu hình: %s"
 
-#:../capplets/default-applications/gnome-da-capplet.c:660
+#:../capplets/default-applications/gnome-da-capplet.c:691
 msgid "Custom"
 msgstr "Tự chọn"
 
-#:../capplets/default-applications/gnome-da-capplet.c:681
+#:../capplets/default-applications/gnome-da-capplet.c:712
 msgid "Could not load the main interface"
 msgstr "Không thể tài giao diện chính"
 
@@ -1762,9 +1763,10 @@ msgstr "Lập các tùy thích cho bàn phím của bạn"
 #.set the timeout value  label with correct value of timeout
 #:../capplets/mouse/gnome-mouse-properties.c:138
 #:../capplets/mouse/gnome-mouse-properties.c:880
-#:../capplets/mouse/gnome-mouse-properties.glade.h:27
-msgid "microseconds"
-msgstr "micrô giây"
+#,c-format
+msgid "%d milliseconds"
+msgid_plural "%d milliseconds"
+msgstr[0] "%d mili giây"
 
 #:../capplets/mouse/gnome-mouse-properties.c:560
 msgid "Unknown Pointer"