diff --git a/po/de.po b/po/de.po
index c830d64..c3b68b2 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,41 +7,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mailnag\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-05-29 16:44+0200\n"
-"PO-Revision-Date: 2011-05-29 17:32+0000\n"
+"POT-Creation-Date: 2011-05-30 14:26+0200\n"
+"PO-Revision-Date: 2011-05-30 14:10+0000\n"
 "Last-Translator: Patrick Ulbrich <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-05-29 17:44+0000\n"
-"X-Generator: Launchpad (build 13117)\n"
+"X-Launchpad-Export-Date: 2011-06-08 13:32+0000\n"
+"X-Generator: Launchpad (build 13144)\n"
 
-#: config_window.py:82
+#: config_window.py:84
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: config_window.py:88
+#: config_window.py:90
 msgid "Name"
 msgstr "Name"
 
-#: config_window.py:264
+#: config_window.py:266
 msgid "Delete this account:"
 msgstr "Dieses Konto löschen:"
 
-#: config_window.py:330
+#: config_window.py:332
 msgid "Unnamed"
 msgstr "Unbenannt"
 
-#: config_window.py:439
+#: config_window.py:441
 msgid "Missing data in account(s):"
 msgstr "Unvollständige Daten in Konto:"
 
-#: config_window.py:442
+#: config_window.py:444
 msgid "Please correct this first."
 msgstr "Bitte behebn Sie dies."
 
-#: config_window.py:456
+#: config_window.py:458
 msgid "Config file does not exist, creating new one"
 msgstr "Konfigurationsdatei existiert nicht, erstelle neue."
 
@@ -52,6 +52,10 @@ msgid ""
 "\n"
 "Do you want to try again?"
 msgstr ""
+"Sperren des Schlüßelbundes \"{0}\" fehlgeschlagen.\n"
+"Falsches Passwort.\n"
+"\n"
+"Möchten Sie es nochmal versuchen?"
 
 #: mailnag.py:528
 msgid "Open in mail reader"
@@ -74,28 +78,28 @@ msgid "You have a new mail."
 msgstr "Sie haben eine neue Email."
 
 #: account_dialog.ui.h:1
+msgid "Accountname:"
+msgstr "Kontoname:"
+
+#: account_dialog.ui.h:2
 msgid "Folder:"
 msgstr "Ordner:"
 
-#: account_dialog.ui.h:2
+#: account_dialog.ui.h:3
 msgid "IMAP"
 msgstr "IMAP"
 
-#: account_dialog.ui.h:3
+#: account_dialog.ui.h:4
 msgid "Mail Account"
 msgstr "Mail-Konto"
 
-#: account_dialog.ui.h:4
-msgid "Name:"
-msgstr "Name:"
-
 #: account_dialog.ui.h:5
 msgid "Password:"
 msgstr "Passwort:"
 
 #: account_dialog.ui.h:6
-msgid "Port:"
-msgstr "Port:"
+msgid "Port (optional):"
+msgstr "Port (optional):"
 
 #: account_dialog.ui.h:7
 msgid "Server:"
@@ -114,6 +118,12 @@ msgid ""
 "Mailnag is based on <a href=\"http:/launchpad.net/popper\">Popper</a>\n"
 "Copyright (c) 2011 Ralf Hersel"
 msgstr ""
+"<a href=\"http:/launchpad.net/mailnag\">Mailnag</a> - Email-Benachrichtigung "
+"für GNOME 3\n"
+"Copyright (c) 2011 Patrick Ulbrich\n"
+"\n"
+"Mailnag basiert auf <a href=\"http:/launchpad.net/popper\">Popper</a>\n"
+"Copyright (c) 2011 Ralf Hersel"
 
 #: config_window.ui.h:6
 msgid "About"
@@ -166,3 +176,9 @@ msgstr "Mailnag automatisch starten"
 #: config_window.ui.h:18
 msgid "minutes"
 msgstr "Minuten"
+
+#~ msgid "Name:"
+#~ msgstr "Name:"
+
+#~ msgid "Port:"
+#~ msgstr "Port:"
diff --git a/po/vi.po b/po/vi.po
new file mode 100644
index 0000000..1340428
--- /dev/null
+++ b/po/vi.po
@@ -0,0 +1,178 @@
+# Vietnamese translation for mailnag
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the mailnag package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: mailnag\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-05-30 14:26+0200\n"
+"PO-Revision-Date: 2011-05-31 05:33+0000\n"
+"Last-Translator: Lê Trường An <truongan@linuxmail.org>\n"
+"Language-Team: Vietnamese <vi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-08 13:32+0000\n"
+"X-Generator: Launchpad (build 13144)\n"
+
+#: config_window.py:84
+msgid "Enabled"
+msgstr "Bật"
+
+#: config_window.py:90
+msgid "Name"
+msgstr "Tên"
+
+#: config_window.py:266
+msgid "Delete this account:"
+msgstr "Xóa tài khoản này:"
+
+#: config_window.py:332
+msgid "Unnamed"
+msgstr "Chưa có tên:"
+
+#: config_window.py:441
+msgid "Missing data in account(s):"
+msgstr "Thất lạc dữ liệu trong tài khoản:"
+
+#: config_window.py:444
+msgid "Please correct this first."
+msgstr "Hãy sửa cái này trước."
+
+#: config_window.py:458
+msgid "Config file does not exist, creating new one"
+msgstr "Tập tin cấu hình không tồn tại, tạo mới"
+
+#: keyring.py:60
+msgid ""
+"Failed to unlock Keyring \"{0}\".\n"
+"Wrong password.\n"
+"\n"
+"Do you want to try again?"
+msgstr ""
+"Mở khóa \"{0}\" thất bại.\n"
+"Sai mật khẩu.\n"
+"\n"
+"Bạn có muốn thử lại?"
+
+#: mailnag.py:528
+msgid "Open in mail reader"
+msgstr "Mở bằng chương trình đọc thư"
+
+#: mailnag.py:529
+msgid "Close"
+msgstr "Đóng"
+
+#: mailnag.py:560
+msgid "(and {0} more)"
+msgstr "(và {0} nữa)"
+
+#: mailnag.py:563
+msgid "You have {0} new mails."
+msgstr "Bạn có {0} thư mới."
+
+#: mailnag.py:565
+msgid "You have a new mail."
+msgstr "Bạn có một thư mới."
+
+#: account_dialog.ui.h:1
+msgid "Accountname:"
+msgstr "Tên tài khoản:"
+
+#: account_dialog.ui.h:2
+msgid "Folder:"
+msgstr "Thư mục:"
+
+#: account_dialog.ui.h:3
+msgid "IMAP"
+msgstr "IMAP"
+
+#: account_dialog.ui.h:4
+msgid "Mail Account"
+msgstr "Tài khoản thư"
+
+#: account_dialog.ui.h:5
+msgid "Password:"
+msgstr "Mật khẩu:"
+
+#: account_dialog.ui.h:6
+msgid "Port (optional):"
+msgstr "Cổng (tùy chọn):"
+
+#: account_dialog.ui.h:7
+msgid "Server:"
+msgstr "Máy chủ"
+
+#: account_dialog.ui.h:8
+msgid "User:"
+msgstr "Người dùng:"
+
+#: config_window.ui.h:1
+msgid ""
+"<a href=\"http:/launchpad.net/mailnag\">Mailnag</a> - A mail notifier for "
+"GNOME 3\n"
+"Copyright (c) 2011 Patrick Ulbrich\n"
+"\n"
+"Mailnag is based on <a href=\"http:/launchpad.net/popper\">Popper</a>\n"
+"Copyright (c) 2011 Ralf Hersel"
+msgstr ""
+"<a href=\"http:/launchpad.net/mailnag\">Mailnag</a> - Trình thông báo thư "
+"điện tử cho GNOME 3\n"
+"Bản quyền (c) 2011 Patrick Ulbrich\n"
+"\n"
+"Mailnag dựa trên <a href=\"http:/launchpad.net/popper\">Popper</a>\n"
+"Bản quyền (c) 2011 Ralf Hersel"
+
+#: config_window.ui.h:6
+msgid "About"
+msgstr "Giới thiệu"
+
+#: config_window.ui.h:7
+msgid "Accounts"
+msgstr "Tài khoản"
+
+#: config_window.ui.h:8
+msgid "Check interval:"
+msgstr "Thời gian kiểm tra thư:"
+
+#: config_window.ui.h:9
+msgid "Enable spamfilter"
+msgstr "Bật bộ lọc thư rác"
+
+#: config_window.ui.h:10
+msgid "Events"
+msgstr "Sự kiện"
+
+#: config_window.ui.h:11
+msgid "General"
+msgstr "Chung"
+
+#: config_window.ui.h:12
+msgid "Mail client:"
+msgstr "Chương trình thư điện tử:"
+
+#: config_window.ui.h:13
+msgid "Mailnag Configuration"
+msgstr "Cấu hình Mailnag"
+
+#: config_window.ui.h:14
+msgid "Messagetray label:"
+msgstr "Nhãn tin nhắn dưới khay hệ thống:"
+
+#: config_window.ui.h:15
+msgid "Play sound on new mails"
+msgstr "Phát âm thanh khi có thư mới"
+
+#: config_window.ui.h:16
+msgid "Spamfilter"
+msgstr "Bộ lọc thư rác"
+
+#: config_window.ui.h:17
+msgid "Start Mailnag automatically"
+msgstr "Tự động chạy Mailnag"
+
+#: config_window.ui.h:18
+msgid "minutes"
+msgstr "phút"