From 8e510107a901dfa7953a65843dca7ef7c2768e82 Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Tue, 09 Mar 2010 15:04:25 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:sugar/mainline

---
diff --git a/po/vi.po b/po/vi.po
index 19a42b8..7cc5e3f 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-05 00:31-0400\n"
-"PO-Revision-Date: 2009-09-25 09:18-0400\n"
+"POT-Creation-Date: 2010-02-11 00:32-0500\n"
+"PO-Revision-Date: 2010-03-07 14:05+0200\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: vi\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 1.2.1\n"
+"X-Generator: Pootle 2.0.1\n"
 
 #: ../extensions/cpsection/aboutme/__init__.py:24
 msgid "About Me"
@@ -53,7 +53,7 @@ msgstr "Sai xác định sự sửa đổi màu."
 msgid "Error in specified colors."
 msgstr "Sai xác định màu."
 
-#: ../extensions/cpsection/aboutme/view.py:94 ../src/jarabe/intro/window.py:92
+#: ../extensions/cpsection/aboutme/view.py:94 ../src/jarabe/intro/window.py:93
 msgid "Name:"
 msgstr "Tên: "
 
@@ -124,7 +124,7 @@ msgstr "Ngày và Giờ"
 msgid "Error timezone does not exist."
 msgstr "Lỗi: múi giờ không tồn tại."
 
-#: ../extensions/cpsection/datetime/view.py:68 ../data/sugar.schemas.in.h:27
+#: ../extensions/cpsection/datetime/view.py:68 ../data/sugar.schemas.in.h:33
 msgid "Timezone"
 msgstr "Múi giờ"
 
@@ -167,15 +167,15 @@ msgstr "Cạnh"
 msgid "Keyboard"
 msgstr "Bàn phím"
 
-#: ../extensions/cpsection/keyboard/view.py:187
+#: ../extensions/cpsection/keyboard/view.py:189
 msgid "Keyboard Model"
 msgstr "Mô hình bàn phím"
 
-#: ../extensions/cpsection/keyboard/view.py:243
+#: ../extensions/cpsection/keyboard/view.py:248
 msgid "Key(s) to change layout"
 msgstr "(Tổ hợp) phím để chuyển đổi bố trí"
 
-#: ../extensions/cpsection/keyboard/view.py:311
+#: ../extensions/cpsection/keyboard/view.py:318
 msgid "Keyboard Layout(s)"
 msgstr "Bố trí Bàn phím"
 
@@ -207,6 +207,26 @@ msgstr ""
 "Thêm các ngôn ngữ theo thứ tự đã thích. Nếu không có bản dịch thì dùng ngôn "
 "ngữ kế tiếp trong danh sách này."
 
+#: ../extensions/cpsection/modemconfiguration/__init__.py:21
+msgid "Modem Configuration"
+msgstr "Cấu hình mô-đêm"
+
+#: ../extensions/cpsection/modemconfiguration/view.py:90
+msgid "Username:"
+msgstr "Tên người dùng:"
+
+#: ../extensions/cpsection/modemconfiguration/view.py:101
+msgid "Password:"
+msgstr "Mật khẩu :"
+
+#: ../extensions/cpsection/modemconfiguration/view.py:112
+msgid "Number:"
+msgstr "Số :"
+
+#: ../extensions/cpsection/modemconfiguration/view.py:123
+msgid "APN:"
+msgstr "APN:"
+
 #: ../extensions/cpsection/network/__init__.py:21
 #: ../extensions/cpsection/network/view.py:28
 msgid "Network"
@@ -293,7 +313,7 @@ msgstr ""
 msgid "Software update"
 msgstr "Cập nhật phần mềm"
 
-#: ../extensions/cpsection/updater/view.py:62
+#: ../extensions/cpsection/updater/view.py:63
 msgid ""
 "Software updates correct errors, eliminate security vulnerabilities, and "
 "provide new features."
@@ -301,77 +321,77 @@ msgstr ""
 "Bản cập nhật phần mềm thì sửa chữa lỗi, loại trừ trường hợp có thể bị lỗ "
 "hổng bảo mật, và cung cấp tính năng mới."
 
-#: ../extensions/cpsection/updater/view.py:122
+#: ../extensions/cpsection/updater/view.py:125
 #, python-format
 msgid "Checking %s..."
 msgstr "Đang kiểm tra %s..."
 
-#: ../extensions/cpsection/updater/view.py:124
+#: ../extensions/cpsection/updater/view.py:127
 #, python-format
 msgid "Downloading %s..."
 msgstr "Đang tải về %s..."
 
-#: ../extensions/cpsection/updater/view.py:126
+#: ../extensions/cpsection/updater/view.py:129
 #, python-format
 msgid "Updating %s..."
 msgstr "Đang cập nhật %s..."
 
-#: ../extensions/cpsection/updater/view.py:135
+#: ../extensions/cpsection/updater/view.py:139
 msgid "Your software is up-to-date"
 msgstr "Phần mềm vẫn còn hiện thời"
 
-#: ../extensions/cpsection/updater/view.py:137
+#: ../extensions/cpsection/updater/view.py:141
 #, python-format
 msgid "You can install %s update"
 msgid_plural "You can install %s updates"
 msgstr[0] "Bạn có dịp cài đặt %s bản cập nhật"
 
-#: ../extensions/cpsection/updater/view.py:155
+#: ../extensions/cpsection/updater/view.py:159
 msgid "Checking for updates..."
 msgstr "Đang kiểm tra có bản cập nhật chưa..."
 
-#: ../extensions/cpsection/updater/view.py:160
+#: ../extensions/cpsection/updater/view.py:164
 msgid "Installing updates..."
 msgstr "Đang cài đặt bản cập nhật..."
 
-#: ../extensions/cpsection/updater/view.py:165
+#: ../extensions/cpsection/updater/view.py:172
 #, python-format
 msgid "%s update was installed"
 msgid_plural "%s updates were installed"
 msgstr[0] "%s bản cập nhật đã được cài đặt"
 
-#: ../extensions/cpsection/updater/view.py:244
+#: ../extensions/cpsection/updater/view.py:253
 msgid "Install selected"
 msgstr "Cài đặt mục đã chọn"
 
-#: ../extensions/cpsection/updater/view.py:265
+#: ../extensions/cpsection/updater/view.py:274
 #, python-format
 msgid "Download size: %s"
 msgstr "Kích cỡ tải về: %s"
 
-#: ../extensions/cpsection/updater/view.py:353
+#: ../extensions/cpsection/updater/view.py:362
 #, python-format
 msgid "From version %(current)d to %(new)s (Size: %(size)s)"
 msgstr "Từ phiên bản %(current)d lên %(new)s (Kích cỡ : %(size)s)"
 
 #. TRANS: download size is 0
-#: ../extensions/cpsection/updater/view.py:373
+#: ../extensions/cpsection/updater/view.py:382
 msgid "None"
 msgstr "Không có"
 
 #. TRANS: download size of very small updates
-#: ../extensions/cpsection/updater/view.py:376
+#: ../extensions/cpsection/updater/view.py:385
 msgid "1 KB"
 msgstr "1 KB"
 
 #. TRANS: download size of small updates, e.g. '250 KB'
-#: ../extensions/cpsection/updater/view.py:379
+#: ../extensions/cpsection/updater/view.py:388
 #, python-format
 msgid "%.0f KB"
 msgstr "%.0f KB"
 
 #. TRANS: download size of updates, e.g. '2.3 MB'
-#: ../extensions/cpsection/updater/view.py:382
+#: ../extensions/cpsection/updater/view.py:391
 #, python-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
@@ -401,47 +421,94 @@ msgstr "%(hour)d:%(min).2d còn lại"
 msgid "Charged"
 msgstr "Sạc đầy"
 
-#: ../extensions/deviceicon/network.py:44
+#: ../extensions/deviceicon/network.py:49
 #, python-format
 msgid "IP address: %s"
 msgstr "Địa chỉ IP: %s"
 
-#: ../extensions/deviceicon/network.py:110
+#: ../extensions/deviceicon/network.py:111
 msgid "Disconnect..."
 msgstr "Ngắt kết nối..."
 
-#: ../extensions/deviceicon/network.py:114
+#: ../extensions/deviceicon/network.py:116
 msgid "Create new wireless network"
 msgstr "Tạo mạng vô tuyến mới"
 
-#: ../extensions/deviceicon/network.py:120
-#: ../src/jarabe/desktop/meshbox.py:264
+#: ../extensions/deviceicon/network.py:122
+#: ../extensions/deviceicon/network.py:284
+#: ../src/jarabe/desktop/meshbox.py:248 ../src/jarabe/desktop/meshbox.py:537
 msgid "Connecting..."
 msgstr "Đang kết nối..."
 
 # TODO: show the channel number
-#: ../extensions/deviceicon/network.py:124
-#: ../extensions/deviceicon/network.py:186
-#: ../src/jarabe/desktop/meshbox.py:270
+#: ../extensions/deviceicon/network.py:126
+#: ../extensions/deviceicon/network.py:198
+#: ../extensions/deviceicon/network.py:288
+#: ../src/jarabe/desktop/meshbox.py:254 ../src/jarabe/desktop/meshbox.py:543
 msgid "Connected"
 msgstr "Đã kết nối"
 
-#: ../extensions/deviceicon/network.py:146
+#: ../extensions/deviceicon/network.py:158
 msgid "Channel"
 msgstr "Kênh"
 
-#: ../extensions/deviceicon/network.py:161
+#: ../extensions/deviceicon/network.py:173
 msgid "Wired Network"
 msgstr "Mạng theo dây"
 
-#: ../extensions/deviceicon/network.py:189
+#: ../extensions/deviceicon/network.py:201
 msgid "Speed"
 msgstr "Tốc độ"
 
-#: ../extensions/deviceicon/network.py:415
+#: ../extensions/deviceicon/network.py:228
+msgid "Wireless modem"
+msgstr "Mô-đem vô tuyến"
+
+#: ../extensions/deviceicon/network.py:276
+msgid "Please wait..."
+msgstr "Hãy đợi..."
+
+#: ../extensions/deviceicon/network.py:279
+#: ../src/jarabe/desktop/meshbox.py:164 ../src/jarabe/desktop/meshbox.py:494
+msgid "Connect"
+msgstr "Kết nối"
+
+#: ../extensions/deviceicon/network.py:280
+msgid "Disconnected"
+msgstr "Bị ngắt kết nối"
+
+#: ../extensions/deviceicon/network.py:283
+#: ../src/jarabe/controlpanel/toolbar.py:115
+#: ../src/jarabe/desktop/homebox.py:68
+#: ../src/jarabe/frame/activitiestray.py:700
+#: ../src/jarabe/frame/activitiestray.py:799
+#: ../src/jarabe/frame/activitiestray.py:827
+msgid "Cancel"
+msgstr "Thôi"
+
+#: ../extensions/deviceicon/network.py:287
+#: ../src/jarabe/desktop/meshbox.py:168
+msgid "Disconnect"
+msgstr "Ngắt kết nối"
+
+#: ../extensions/deviceicon/network.py:530
 #, python-format
-msgid "%s's network %s"
-msgstr "Mạng của %s %s"
+msgid "%s's network"
+msgstr "Mạng của %s"
+
+#: ../extensions/deviceicon/network.py:597
+#: ../extensions/deviceicon/network.py:656
+msgid "Mesh Network"
+msgstr "Mạng mắc lưới"
+
+#: ../extensions/deviceicon/network.py:857
+#, python-format
+msgid "Data sent %d kb / received %d kb"
+msgstr "Dữ liệu đã gửi %d kb / đã nhận %d kb"
+
+#: ../extensions/deviceicon/network.py:868
+msgid "Connection time "
+msgstr "Thời gian kết nối "
 
 #: ../extensions/deviceicon/speaker.py:59
 msgid "My Speakers"
@@ -455,39 +522,47 @@ msgstr "Bỏ câm"
 msgid "Mute"
 msgstr "Câm"
 
-#: ../extensions/globalkey/screenshot.py:56
+#: ../extensions/globalkey/screenshot.py:59
 msgid "Mesh"
 msgstr "Mesh"
 
-#: ../extensions/globalkey/screenshot.py:58
+#: ../extensions/globalkey/screenshot.py:61
 #: ../src/jarabe/frame/zoomtoolbar.py:39
 msgid "Group"
 msgstr "Nhóm"
 
-#: ../extensions/globalkey/screenshot.py:60
+#: ../extensions/globalkey/screenshot.py:63
 #: ../src/jarabe/frame/zoomtoolbar.py:41
 msgid "Home"
 msgstr "Nhà"
 
-#: ../extensions/globalkey/screenshot.py:66
+#: ../extensions/globalkey/screenshot.py:69
 #: ../src/jarabe/frame/zoomtoolbar.py:43
 msgid "Activity"
 msgstr "Hoạt động"
 
-#: ../extensions/globalkey/screenshot.py:69
+#: ../extensions/globalkey/screenshot.py:72
 msgid "Screenshot"
 msgstr "Ảnh chụp màn hình"
 
-#: ../extensions/globalkey/screenshot.py:71
+#: ../extensions/globalkey/screenshot.py:74
 #, python-format
 msgid "Screenshot of \"%s\""
 msgstr "Ảnh chụp màn hình « %s »"
 
 #: ../data/sugar.schemas.in.h:1
+msgid ""
+"\"disabled\" to ask nick on initialization; \"system\" to reuse UNIX account "
+"long name."
+msgstr ""
+"« bị tắt » để yêu cầu tên hiệu khi sơ khởi; « hệ thống » để dùng lại tên dài "
+"của tài khoản UNIX."
+
+#: ../data/sugar.schemas.in.h:2
 msgid "Backup URL"
 msgstr "URL sao lưu"
 
-#: ../data/sugar.schemas.in.h:2
+#: ../data/sugar.schemas.in.h:3
 msgid ""
 "Color for the XO icon that is used throughout the desktop. The string is "
 "composed of the stroke color and fill color, format is that of rbg colors. "
@@ -496,31 +571,51 @@ msgstr ""
 "Màu của biểu tượng XO được dùng trong toàn môi trường. Chuỗi bao gồm màu nét "
 "và màu tô đầy, định dạng là RBG, v.d. #AC32FF,#9A5200"
 
-#: ../data/sugar.schemas.in.h:3
+#: ../data/sugar.schemas.in.h:4
 msgid "Corner Delay"
 msgstr "Trễ góc"
 
-#: ../data/sugar.schemas.in.h:4
+#: ../data/sugar.schemas.in.h:5
+msgid "Default font face"
+msgstr "Mặt chữ mặc định"
+
+#: ../data/sugar.schemas.in.h:6
+msgid "Default font size"
+msgstr "Cỡ phông mặc định"
+
+#: ../data/sugar.schemas.in.h:7
+msgid "Default nick"
+msgstr "Tên hiệu mặc định"
+
+#: ../data/sugar.schemas.in.h:8
 msgid "Delay for the activation of the frame using the corners."
 msgstr "Khoảng đợi khi kích hoạt khung dùng góc."
 
-#: ../data/sugar.schemas.in.h:5
+#: ../data/sugar.schemas.in.h:9
 msgid "Delay for the activation of the frame using the edges."
 msgstr "Khoảng đợi khi kích hoạt khung dùng cạnh."
 
-#: ../data/sugar.schemas.in.h:6
+#: ../data/sugar.schemas.in.h:10
 msgid "Edge Delay"
 msgstr "Trễ cạnh"
 
-#: ../data/sugar.schemas.in.h:7
+#: ../data/sugar.schemas.in.h:11
 msgid "Favorites Layout"
 msgstr "Bố trí Ưa thích"
 
-#: ../data/sugar.schemas.in.h:8
+#: ../data/sugar.schemas.in.h:12
 msgid "Favorites resume mode"
 msgstr "Chế độ tiếp tục lại mục ưa thích"
 
-#: ../data/sugar.schemas.in.h:9
+#: ../data/sugar.schemas.in.h:13
+msgid "Font face that is used throughout the desktop."
+msgstr "Mặt phông chữ được sử dụng trên toàn bộ môi trường."
+
+#: ../data/sugar.schemas.in.h:14
+msgid "Font size that is used throughout the desktop."
+msgstr "Kích cỡ phông chữ được sử dụng trên toàn bộ môi trường."
+
+#: ../data/sugar.schemas.in.h:15
 msgid ""
 "If TRUE, Sugar will make us searchable for the other users of the Jabber "
 "server."
@@ -528,108 +623,108 @@ msgstr ""
 "TRUE (đúng) thì Sugar sẽ cấp các người khác trên máy phục vụ Jabber có quyền "
 "tìm kiếm qua chúng ta."
 
-#: ../data/sugar.schemas.in.h:10
+#: ../data/sugar.schemas.in.h:16
 msgid "If TRUE, Sugar will show a \"Log out\" option."
 msgstr "TRUE (đúng) thì Sugar hiển thị một tùy chọn « Đăng xuất »."
 
-#: ../data/sugar.schemas.in.h:11
+#: ../data/sugar.schemas.in.h:17
 msgid "Jabber Server"
 msgstr "Máy phục vụ Jabber"
 
-#: ../data/sugar.schemas.in.h:12
+#: ../data/sugar.schemas.in.h:18
 msgid "Keyboard layouts"
 msgstr "Bố trí bàn phím"
 
-#: ../data/sugar.schemas.in.h:13
+#: ../data/sugar.schemas.in.h:19
 msgid "Keyboard model"
 msgstr "Mô hình bàn phím"
 
-#: ../data/sugar.schemas.in.h:14
+#: ../data/sugar.schemas.in.h:20
 msgid "Keyboard options"
 msgstr "Tuỳ chọn bàn phím"
 
-#: ../data/sugar.schemas.in.h:15
+#: ../data/sugar.schemas.in.h:21
 msgid "Layout of the favorites view."
 msgstr "Bố trí của ô xem các mục ưa thích."
 
-#: ../data/sugar.schemas.in.h:16
+#: ../data/sugar.schemas.in.h:22
 msgid ""
 "List of keyboard layouts. Each entry should be in the form layout(variant)"
 msgstr "Danh sách các bố trí bàn phím. Mỗi mục nên có dạng « bố_trí(biến_đổi) »"
 
-#: ../data/sugar.schemas.in.h:17
+#: ../data/sugar.schemas.in.h:23
 msgid "List of keyboard options."
 msgstr "Danh sách các tuỳ chọn về bàn phím."
 
-#: ../data/sugar.schemas.in.h:18
+#: ../data/sugar.schemas.in.h:24
 msgid "Power Automatic"
 msgstr "Tự động năng lượng"
 
-#: ../data/sugar.schemas.in.h:19
+#: ../data/sugar.schemas.in.h:25
 msgid "Power Automatic."
 msgstr "Tự động năng lượng."
 
-#: ../data/sugar.schemas.in.h:20
+#: ../data/sugar.schemas.in.h:26
 msgid "Power Extreme"
 msgstr "Năng lượng cực"
 
-#: ../data/sugar.schemas.in.h:21
+#: ../data/sugar.schemas.in.h:27
 msgid "Power Extreme."
 msgstr "Năng lượng cực."
 
-#: ../data/sugar.schemas.in.h:22
+#: ../data/sugar.schemas.in.h:28
 msgid "Publish to Gadget"
 msgstr "Xuất tới Gadget"
 
-#: ../data/sugar.schemas.in.h:23
+#: ../data/sugar.schemas.in.h:29
 msgid "Setting for muting the sound device."
 msgstr "Thiết lập để câm thiết bị âm thanh."
 
-#: ../data/sugar.schemas.in.h:24
+#: ../data/sugar.schemas.in.h:30
 msgid "Show Log out"
 msgstr "Hiện Đăng xuất"
 
-#: ../data/sugar.schemas.in.h:25
+#: ../data/sugar.schemas.in.h:31
 msgid "Sound Muted"
 msgstr "Âm câm"
 
-#: ../data/sugar.schemas.in.h:26
+#: ../data/sugar.schemas.in.h:32
 msgid "The keyboard model to be used"
 msgstr "Mô hình bàn phím cần dùng"
 
-#: ../data/sugar.schemas.in.h:28
+#: ../data/sugar.schemas.in.h:34
 msgid "Timezone setting for the system."
 msgstr "Thiết lập múi giờ cho hệ thống."
 
-#: ../data/sugar.schemas.in.h:29
+#: ../data/sugar.schemas.in.h:35
 msgid "Url of the jabber server to use."
 msgstr "Địa chỉ URL của máy phục vụ Jabber cần dùng."
 
-#: ../data/sugar.schemas.in.h:30
+#: ../data/sugar.schemas.in.h:36
 msgid "Url where the backup is saved to."
 msgstr "Địa chỉ URL vào đó lưu bản sao lưu."
 
-#: ../data/sugar.schemas.in.h:31
+#: ../data/sugar.schemas.in.h:37
 msgid "User Color"
 msgstr "Màu người dùng"
 
-#: ../data/sugar.schemas.in.h:32
+#: ../data/sugar.schemas.in.h:38
 msgid "User Name"
 msgstr "Tên người dùng"
 
-#: ../data/sugar.schemas.in.h:33
+#: ../data/sugar.schemas.in.h:39
 msgid "User name that is used throughout the desktop."
 msgstr "Tên người dùng được sử dụng trên toàn bộ môi trường."
 
-#: ../data/sugar.schemas.in.h:34
+#: ../data/sugar.schemas.in.h:40
 msgid "Volume Level"
 msgstr "Cấp âm"
 
-#: ../data/sugar.schemas.in.h:35
+#: ../data/sugar.schemas.in.h:41
 msgid "Volume level for the sound device."
 msgstr "Cấp âm lượng cho thiết bị âm thanh."
 
-#: ../data/sugar.schemas.in.h:36
+#: ../data/sugar.schemas.in.h:42
 msgid ""
 "When in resume mode, clicking on a favorite icon will cause the last entry "
 "for that activity to be resumed."
@@ -688,90 +783,68 @@ msgstr ""
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "Để áp dụng các thay đổi thì cần phải khởi chạy lại pn sugar.\n"
 
-#: ../src/jarabe/controlpanel/gui.py:280
+#: ../src/jarabe/controlpanel/gui.py:281
 msgid "Warning"
 msgstr "Cảnh báo"
 
-#: ../src/jarabe/controlpanel/gui.py:281
+#: ../src/jarabe/controlpanel/gui.py:282
 #: ../src/jarabe/controlpanel/sectionview.py:42
 msgid "Changes require restart"
 msgstr "Có thay đổi thì cần phải khởi chạy lại"
 
-#: ../src/jarabe/controlpanel/gui.py:284
+#: ../src/jarabe/controlpanel/gui.py:285
 msgid "Cancel changes"
 msgstr "Thôi thay đổi"
 
-#: ../src/jarabe/controlpanel/gui.py:289 ../src/jarabe/desktop/homebox.py:70
+#: ../src/jarabe/controlpanel/gui.py:290 ../src/jarabe/desktop/homebox.py:70
 msgid "Later"
 msgstr "Về sau"
 
-#: ../src/jarabe/controlpanel/gui.py:293
+#: ../src/jarabe/controlpanel/gui.py:294
 msgid "Restart now"
 msgstr "Khởi chạy lại ngay"
 
-#: ../src/jarabe/controlpanel/toolbar.py:61 ../src/jarabe/intro/window.py:188
+#: ../src/jarabe/controlpanel/toolbar.py:61 ../src/jarabe/intro/window.py:206
 msgid "Done"
 msgstr "Hoàn tất"
 
-#: ../src/jarabe/controlpanel/toolbar.py:115
-#: ../src/jarabe/desktop/homebox.py:68
-#: ../src/jarabe/frame/activitiestray.py:726
-#: ../src/jarabe/frame/activitiestray.py:822
-#: ../src/jarabe/frame/activitiestray.py:850
-msgid "Cancel"
-msgstr "Thôi"
-
 #: ../src/jarabe/controlpanel/toolbar.py:121
-#: ../src/jarabe/desktop/favoritesview.py:332
+#: ../src/jarabe/desktop/favoritesview.py:333
 msgid "Ok"
 msgstr "OK"
 
-#: ../src/jarabe/desktop/activitieslist.py:80
-#: ../src/jarabe/journal/listview.py:147
-msgid "Title"
-msgstr "Tên"
-
-#: ../src/jarabe/desktop/activitieslist.py:91
-msgid "Version"
-msgstr "Phiên bản"
-
-#: ../src/jarabe/desktop/activitieslist.py:105
-#: ../src/jarabe/journal/listview.py:178
-msgid "Date"
-msgstr "Ngày"
-
-#: ../src/jarabe/desktop/activitieslist.py:234
+#: ../src/jarabe/desktop/activitieslist.py:236
 #, python-format
 msgid "Version %s"
 msgstr "Phiên bản %s"
 
-#: ../src/jarabe/desktop/activitieslist.py:355
+#: ../src/jarabe/desktop/activitieslist.py:357
 msgid "Confirm erase"
 msgstr "Xác nhận việc xoá"
 
-#: ../src/jarabe/desktop/activitieslist.py:357
+#: ../src/jarabe/desktop/activitieslist.py:359
 #, python-format
 msgid "Confirm erase: Do you want to permanently erase %s?"
 msgstr "Xác nhận việc xoá: bạn có muốn xoá hẳn %s không?"
 
-#: ../src/jarabe/desktop/activitieslist.py:361
-#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/desktop/activitieslist.py:363
+#: ../src/jarabe/frame/clipboardmenu.py:63
 #: ../src/jarabe/view/viewsource.py:218
 msgid "Keep"
 msgstr "Giữ"
 
-#: ../src/jarabe/desktop/activitieslist.py:364
-#: ../src/jarabe/desktop/activitieslist.py:407
+#: ../src/jarabe/desktop/activitieslist.py:366
+#: ../src/jarabe/desktop/activitieslist.py:409
 #: ../src/jarabe/journal/journaltoolbox.py:360
-#: ../src/jarabe/journal/palettes.py:112
+#: ../src/jarabe/journal/palettes.py:105
 msgid "Erase"
 msgstr "Xoá"
 
-#: ../src/jarabe/desktop/activitieslist.py:428
+#: ../src/jarabe/desktop/activitieslist.py:430
 msgid "Remove favorite"
 msgstr "Bỏ Ưa thích"
 
-#: ../src/jarabe/desktop/activitieslist.py:432
+#: ../src/jarabe/desktop/activitieslist.py:434
 msgid "Make favorite"
 msgstr "Đặt Ưa thích"
 
@@ -805,24 +878,24 @@ msgstr "Hộp"
 msgid "Triangle"
 msgstr "Hình giác"
 
-#: ../src/jarabe/desktop/favoritesview.py:323
+#: ../src/jarabe/desktop/favoritesview.py:324
 msgid "Registration Failed"
 msgstr "Lỗi đăng ký"
 
-#: ../src/jarabe/desktop/favoritesview.py:324
+#: ../src/jarabe/desktop/favoritesview.py:325
 #, python-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/jarabe/desktop/favoritesview.py:326
+#: ../src/jarabe/desktop/favoritesview.py:327
 msgid "Registration Successful"
 msgstr "Đang ký thành công"
 
-#: ../src/jarabe/desktop/favoritesview.py:327
+#: ../src/jarabe/desktop/favoritesview.py:328
 msgid "You are now registered with your school server."
 msgstr "Bạn đã đăng ký với máy phục vụ trường học."
 
-#: ../src/jarabe/desktop/favoritesview.py:671
+#: ../src/jarabe/desktop/favoritesview.py:630
 msgid "Register"
 msgstr "Đăng ký"
 
@@ -854,41 +927,38 @@ msgstr "Xem Ưa thích"
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
-#: ../src/jarabe/desktop/keydialog.py:131
+#: ../src/jarabe/desktop/keydialog.py:135
 msgid "Key Type:"
 msgstr "Kiểu khoá:"
 
-#: ../src/jarabe/desktop/keydialog.py:151
+#: ../src/jarabe/desktop/keydialog.py:155
 msgid "Authentication Type:"
 msgstr "Cách xác thực: "
 
-#: ../src/jarabe/desktop/keydialog.py:215
+#: ../src/jarabe/desktop/keydialog.py:220
 msgid "WPA & WPA2 Personal"
 msgstr "WPA và WPA2 Cá nhân"
 
-#: ../src/jarabe/desktop/keydialog.py:224
+#: ../src/jarabe/desktop/keydialog.py:229
 msgid "Wireless Security:"
 msgstr "Bảo mật Không dây:"
 
-#: ../src/jarabe/desktop/meshbox.py:136
-msgid "Connect"
-msgstr "Kết nối"
-
-#: ../src/jarabe/desktop/meshbox.py:140
-msgid "Disconnect"
-msgstr "Ngắt kết nối"
+#: ../src/jarabe/desktop/meshbox.py:492
+#, python-format
+msgid "Mesh Network %d"
+msgstr "Mạng mắc lưới %d"
 
 # TRANS: Action label for resuming an activity.
 #. TRANS: Action label for resuming an activity.
-#: ../src/jarabe/desktop/meshbox.py:466
-#: ../src/jarabe/frame/activitiestray.py:761
+#: ../src/jarabe/desktop/meshbox.py:629
+#: ../src/jarabe/frame/activitiestray.py:735
 #: ../src/jarabe/journal/journaltoolbox.py:428
-#: ../src/jarabe/journal/palettes.py:72 ../src/jarabe/view/palettes.py:64
+#: ../src/jarabe/journal/palettes.py:65 ../src/jarabe/view/palettes.py:67
 msgid "Resume"
 msgstr "Tiếp tục"
 
-#: ../src/jarabe/desktop/meshbox.py:471
-#: ../src/jarabe/frame/activitiestray.py:235
+#: ../src/jarabe/desktop/meshbox.py:634
+#: ../src/jarabe/frame/activitiestray.py:233
 msgid "Join"
 msgstr "Vào"
 
@@ -900,66 +970,66 @@ msgstr "Không thể kết nối tới máy phục vụ."
 msgid "The server could not complete the request."
 msgstr "Máy phục vụ không thể hoàn tất yêu cầu."
 
-#: ../src/jarabe/frame/activitiestray.py:240
-#: ../src/jarabe/frame/activitiestray.py:698
+#: ../src/jarabe/frame/activitiestray.py:238
+#: ../src/jarabe/frame/activitiestray.py:672
 msgid "Decline"
 msgstr "Từ chối"
 
-#: ../src/jarabe/frame/activitiestray.py:650
+#: ../src/jarabe/frame/activitiestray.py:624
 #, python-format
 msgid "%dB"
 msgstr "%dB"
 
-#: ../src/jarabe/frame/activitiestray.py:652
+#: ../src/jarabe/frame/activitiestray.py:626
 #, python-format
 msgid "%dKB"
 msgstr "%dKB"
 
-#: ../src/jarabe/frame/activitiestray.py:654
+#: ../src/jarabe/frame/activitiestray.py:628
 #, python-format
 msgid "%dMB"
 msgstr "%dMB"
 
-#: ../src/jarabe/frame/activitiestray.py:671
+#: ../src/jarabe/frame/activitiestray.py:645
 #, python-format
 msgid "%s of %s"
 msgstr "%s trên %s"
 
-#: ../src/jarabe/frame/activitiestray.py:683
+#: ../src/jarabe/frame/activitiestray.py:657
 #, python-format
 msgid "Transfer from %r"
 msgstr "Truyền từ %r"
 
-#: ../src/jarabe/frame/activitiestray.py:693
+#: ../src/jarabe/frame/activitiestray.py:667
 msgid "Accept"
 msgstr "Chấp nhận"
 
-#: ../src/jarabe/frame/activitiestray.py:716
-#: ../src/jarabe/frame/activitiestray.py:840
+#: ../src/jarabe/frame/activitiestray.py:690
+#: ../src/jarabe/frame/activitiestray.py:817
 #, python-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../src/jarabe/frame/activitiestray.py:750
-#: ../src/jarabe/frame/activitiestray.py:875
+#: ../src/jarabe/frame/activitiestray.py:724
+#: ../src/jarabe/frame/activitiestray.py:852
 msgid "Dismiss"
 msgstr "Hủy"
 
-#: ../src/jarabe/frame/activitiestray.py:810
+#: ../src/jarabe/frame/activitiestray.py:787
 #, python-format
 msgid "Transfer to %r"
 msgstr "Truyền tới %r"
 
-#: ../src/jarabe/frame/clipboardmenu.py:52 ../src/jarabe/view/palettes.py:218
+#: ../src/jarabe/frame/clipboardmenu.py:53 ../src/jarabe/view/palettes.py:221
 msgid "Remove"
 msgstr "Bỏ"
 
-#: ../src/jarabe/frame/clipboardmenu.py:57
-#: ../src/jarabe/frame/clipboardmenu.py:80
+#: ../src/jarabe/frame/clipboardmenu.py:58
+#: ../src/jarabe/frame/clipboardmenu.py:81
 msgid "Open"
 msgstr "Mở"
 
-#: ../src/jarabe/frame/clipboardmenu.py:85
+#: ../src/jarabe/frame/clipboardmenu.py:86
 msgid "Open with"
 msgstr "Mở bằng"
 
@@ -988,59 +1058,59 @@ msgstr "F3"
 msgid "F4"
 msgstr "F4"
 
-#: ../src/jarabe/intro/window.py:124
+#: ../src/jarabe/intro/window.py:128
 msgid "Click to change color:"
 msgstr "Nhấn vào để thay đổi mảu : "
 
-#: ../src/jarabe/intro/window.py:174 ../src/jarabe/journal/detailview.py:103
+#: ../src/jarabe/intro/window.py:192 ../src/jarabe/journal/detailview.py:103
 msgid "Back"
 msgstr "Lùi"
 
-#: ../src/jarabe/intro/window.py:191
+#: ../src/jarabe/intro/window.py:209
 msgid "Next"
 msgstr "Tiếp"
 
-#: ../src/jarabe/journal/expandedentry.py:164
-#: ../src/jarabe/journal/palettes.py:66
+#: ../src/jarabe/journal/expandedentry.py:152
+#: ../src/jarabe/journal/palettes.py:59
 msgid "Untitled"
 msgstr "Không tên"
 
-#: ../src/jarabe/journal/expandedentry.py:210
+#: ../src/jarabe/journal/expandedentry.py:243
 msgid "No preview"
 msgstr "Không xem thử"
 
-#: ../src/jarabe/journal/expandedentry.py:229
+#: ../src/jarabe/journal/expandedentry.py:262
 #, python-format
 msgid "Kind: %s"
 msgstr "Kiểu : %s"
 
-#: ../src/jarabe/journal/expandedentry.py:229
+#: ../src/jarabe/journal/expandedentry.py:262
 msgid "Unknown"
 msgstr "Không rõ"
 
-#: ../src/jarabe/journal/expandedentry.py:230
+#: ../src/jarabe/journal/expandedentry.py:263
 #, python-format
 msgid "Date: %s"
 msgstr "Ngày: %s"
 
-#: ../src/jarabe/journal/expandedentry.py:231
+#: ../src/jarabe/journal/expandedentry.py:264
 #, python-format
 msgid "Size: %s"
 msgstr "Kích cỡ : %s"
 
-#: ../src/jarabe/journal/expandedentry.py:253 ../src/jarabe/journal/misc.py:92
+#: ../src/jarabe/journal/expandedentry.py:286 ../src/jarabe/journal/misc.py:93
 msgid "No date"
 msgstr "Không có ngày tháng"
 
-#: ../src/jarabe/journal/expandedentry.py:260
+#: ../src/jarabe/journal/expandedentry.py:293
 msgid "Participants:"
 msgstr "Người dự :"
 
-#: ../src/jarabe/journal/expandedentry.py:283
+#: ../src/jarabe/journal/expandedentry.py:316
 msgid "Description:"
 msgstr "Mô tả:"
 
-#: ../src/jarabe/journal/expandedentry.py:309
+#: ../src/jarabe/journal/expandedentry.py:341
 msgid "Tags:"
 msgstr "Thẻ:"
 
@@ -1102,26 +1172,26 @@ msgstr "Bất cứ gì"
 
 # TODO: Add "Start with" menu item
 #: ../src/jarabe/journal/journaltoolbox.py:350
-#: ../src/jarabe/journal/palettes.py:90
+#: ../src/jarabe/journal/palettes.py:83
 msgid "Copy"
 msgstr "Chép"
 
 # TRANS: Action label for starting an entry.
 #. TRANS: Action label for starting an entry.
 #: ../src/jarabe/journal/journaltoolbox.py:431
-#: ../src/jarabe/journal/palettes.py:75
+#: ../src/jarabe/journal/palettes.py:68
 msgid "Start"
 msgstr "Khởi chạy"
 
-#: ../src/jarabe/journal/listview.py:361
+#: ../src/jarabe/journal/listview.py:373
 msgid "Your Journal is empty"
 msgstr "Nhật ký của bạn còn trống"
 
-#: ../src/jarabe/journal/listview.py:363
+#: ../src/jarabe/journal/listview.py:375
 msgid "No matching entries"
 msgstr "Không tìm thấy"
 
-#: ../src/jarabe/journal/listview.py:374
+#: ../src/jarabe/journal/listview.py:386
 msgid "Clear search"
 msgstr "Xoá trường tìm"
 
@@ -1148,35 +1218,35 @@ msgstr "Chọn một đối tượng"
 msgid "Close"
 msgstr "Đóng"
 
-#: ../src/jarabe/journal/palettes.py:73
+#: ../src/jarabe/journal/palettes.py:66
 msgid "Resume with"
 msgstr "Tiếp tục lại với"
 
-#: ../src/jarabe/journal/palettes.py:76
+#: ../src/jarabe/journal/palettes.py:69
 msgid "Start with"
 msgstr "Bắt đầu với"
 
-#: ../src/jarabe/journal/palettes.py:98
+#: ../src/jarabe/journal/palettes.py:91
 msgid "Send to"
 msgstr "Gửi cho"
 
-#: ../src/jarabe/journal/palettes.py:107
+#: ../src/jarabe/journal/palettes.py:100
 msgid "View Details"
 msgstr "Xem chi tiết"
 
-#: ../src/jarabe/journal/palettes.py:185
+#: ../src/jarabe/journal/palettes.py:178
 msgid "No friends present"
 msgstr "Bạn bè không có mặt"
 
-#: ../src/jarabe/journal/palettes.py:190
+#: ../src/jarabe/journal/palettes.py:183
 msgid "No valid connection found"
 msgstr "Không tìm thấy kết nối hợp lệ"
 
-#: ../src/jarabe/journal/palettes.py:218
+#: ../src/jarabe/journal/palettes.py:211
 msgid "No activity to resume entry"
 msgstr "Không có hoạt động để tiếp tục nhập vào"
 
-#: ../src/jarabe/journal/palettes.py:220
+#: ../src/jarabe/journal/palettes.py:213
 msgid "No activity to start entry"
 msgstr "Không có hoạt động cần lại để bắt đầu nhập vào"
 
@@ -1210,23 +1280,23 @@ msgid "Starting..."
 msgstr "Đang khởi chạy..."
 
 #. TODO: share-with, keep
-#: ../src/jarabe/view/palettes.py:71
+#: ../src/jarabe/view/palettes.py:74
 msgid "View Source"
 msgstr "Xem nguồn"
 
-#: ../src/jarabe/view/palettes.py:82
+#: ../src/jarabe/view/palettes.py:85
 msgid "Stop"
 msgstr "Dừng"
 
-#: ../src/jarabe/view/palettes.py:122
+#: ../src/jarabe/view/palettes.py:125
 msgid "Start new"
 msgstr "Khởi chạy mới"
 
-#: ../src/jarabe/view/palettes.py:171
+#: ../src/jarabe/view/palettes.py:174
 msgid "Show contents"
 msgstr "Hiện nội dung"
 
-#: ../src/jarabe/view/palettes.py:193 ../src/jarabe/view/palettes.py:243
+#: ../src/jarabe/view/palettes.py:196 ../src/jarabe/view/palettes.py:246
 #, python-format
 msgid "%(free_space)d MB Free"
 msgstr "%(free_space)d MB còn rảnh"
@@ -1248,6 +1318,15 @@ msgstr "Nguồn bó hoạt động"
 msgid "View source: %r"
 msgstr "Xem nguồn: %r"
 
+#~ msgid "Title"
+#~ msgstr "Tên"
+
+#~ msgid "Version"
+#~ msgstr "Phiên bản"
+
+#~ msgid "Date"
+#~ msgstr "Ngày"
+
 #~ msgid "Cannot obtain data needed for registration."
 #~ msgstr "Không thể lấy dữ liệu cần thiết để đăng ký."
 
@@ -1274,12 +1353,6 @@ msgstr "Xem nguồn: %r"
 #~ msgid "Disconnecting..."
 #~ msgstr "Đang ngắt kết nối..."
 
-#~ msgid "Mesh Network"
-#~ msgstr "Mạng mắc lưới"
-
-#~ msgid "Disconnected"
-#~ msgstr "Bị ngắt kết nối"
-
 #~ msgid "About my XO"
 #~ msgstr "Giới thiệu XO của mình"
 
--
cgit v0.9.1