summaryrefslogtreecommitdiff
path: root/locale/vi/LC_MESSAGES/statusnet.po
diff options
context:
space:
mode:
Diffstat (limited to 'locale/vi/LC_MESSAGES/statusnet.po')
-rw-r--r--locale/vi/LC_MESSAGES/statusnet.po840
1 files changed, 438 insertions, 402 deletions
diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po
index 029f4c86f..b503aa625 100644
--- a/locale/vi/LC_MESSAGES/statusnet.po
+++ b/locale/vi/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-05 22:10+0000\n"
-"PO-Revision-Date: 2010-01-05 22:12:52+0000\n"
+"POT-Creation-Date: 2010-01-11 23:25+0000\n"
+"PO-Revision-Date: 2010-01-11 23:28:31+0000\n"
"Language-Team: Vietnamese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r60693); Translate extension (2010-01-04)\n"
+"X-Generator: MediaWiki 1.16alpha (r60950); Translate extension (2010-01-04)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: vi\n"
"X-Message-Group: out-statusnet\n"
@@ -38,7 +38,7 @@ msgstr "Không có tin nhắn nào."
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
-#: actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
#: actions/replies.php:73 actions/repliesrss.php:38
#: actions/showfavorites.php:105 actions/userbyid.php:74
@@ -50,11 +50,6 @@ msgstr "Không có tin nhắn nào."
msgid "No such user."
msgstr "Không có user nào."
-#: actions/all.php:84
-#, fuzzy, php-format
-msgid "%s and friends, page %d"
-msgstr "%s và bạn bè"
-
#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
@@ -93,8 +88,8 @@ msgstr ""
#: actions/all.php:134
#, php-format
msgid ""
-"You can try to [nudge %s](../%s) from his profile or [post something to his "
-"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
+"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
+"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
@@ -120,6 +115,23 @@ msgstr ""
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
+#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
+#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
+#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
+#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151
+#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122
+#: actions/apitimelineretweetedtome.php:121
+#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
+#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "Phương thức API không tìm thấy!"
@@ -178,6 +190,9 @@ msgstr ""
#: actions/apiaccountupdateprofilebackgroundimage.php:146
#: actions/apiaccountupdateprofilecolors.php:164
#: actions/apiaccountupdateprofilecolors.php:174
+#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
#, fuzzy
msgid "Unable to save your design settings."
msgstr "Không thể lưu thông tin Twitter của bạn!"
@@ -221,26 +236,6 @@ msgstr "Tin nhắn riêng"
msgid "All the direct messages sent to %s"
msgstr ""
-#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
-#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
-#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
-#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
-#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
-#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
-#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
-#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151
-#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122
-#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
-msgid "API method not found!"
-msgstr "Phương thức API không tìm thấy!"
-
#: actions/apidirectmessagenew.php:126
#, fuzzy
msgid "No message text!"
@@ -267,7 +262,7 @@ msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
#: actions/apifavoritecreate.php:119
#, fuzzy
-msgid "This status is already a favorite!"
+msgid "This status is already a favorite."
msgstr "Tin nhắn này đã có trong danh sách tin nhắn ưa thích của bạn rồi!"
#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
@@ -276,7 +271,7 @@ msgstr "Không thể tạo favorite."
#: actions/apifavoritedestroy.php:122
#, fuzzy
-msgid "That status is not a favorite!"
+msgid "That status is not a favorite."
msgstr "Tin nhắn này đã có trong danh sách tin nhắn ưa thích của bạn rồi!"
#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
@@ -300,8 +295,9 @@ msgid "Could not unfollow user: User not found."
msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
#: actions/apifriendshipsdestroy.php:120
-msgid "You cannot unfollow yourself!"
-msgstr ""
+#, fuzzy
+msgid "You cannot unfollow yourself."
+msgstr "Không thể cập nhật thành viên."
#: actions/apifriendshipsexists.php:94
msgid "Two user ids or screen_names must be supplied."
@@ -388,7 +384,7 @@ msgstr ""
msgid "Group not found!"
msgstr "Phương thức API không tìm thấy!"
-#: actions/apigroupjoin.php:110
+#: actions/apigroupjoin.php:110 actions/joingroup.php:90
#, fuzzy
msgid "You are already a member of that group."
msgstr "Bạn đã theo những người này:"
@@ -397,9 +393,9 @@ msgstr "Bạn đã theo những người này:"
msgid "You have been blocked from that group by the admin."
msgstr ""
-#: actions/apigroupjoin.php:138
+#: actions/apigroupjoin.php:138 actions/joingroup.php:128
#, fuzzy, php-format
-msgid "Could not join user %s to group %s."
+msgid "Could not join user %1$s to group %2$s."
msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
#: actions/apigroupleave.php:114
@@ -407,9 +403,9 @@ msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè c
msgid "You are not a member of this group."
msgstr "Bạn chưa cập nhật thông tin riêng"
-#: actions/apigroupleave.php:124
+#: actions/apigroupleave.php:124 actions/leavegroup.php:127
#, fuzzy, php-format
-msgid "Could not remove user %s to group %s."
+msgid "Could not remove user %1$s from group %2$s."
msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
#: actions/apigrouplist.php:95
@@ -417,11 +413,6 @@ msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè c
msgid "%s's groups"
msgstr "%s và nhóm"
-#: actions/apigrouplist.php:103
-#, php-format
-msgid "Groups %s is a member of on %s."
-msgstr "Bạn chưa cập nhật thông tin riêng"
-
#: actions/apigrouplistall.php:90 actions/usergroups.php:62
#, fuzzy, php-format
msgid "%s groups"
@@ -465,7 +456,7 @@ msgid "No status with that ID found."
msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
-#: scripts/maildaemon.php:71
+#: lib/mailhandler.php:60
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Quá dài. Tối đa là 140 ký tự."
@@ -486,12 +477,12 @@ msgstr "Không hỗ trợ kiểu file ảnh này."
#: actions/apitimelinefavorites.php:108
#, fuzzy, php-format
-msgid "%s / Favorites from %s"
+msgid "%1$s / Favorites from %2$s"
msgstr "Tìm kiếm các tin nhắn ưa thích của %s"
#: actions/apitimelinefavorites.php:120
#, fuzzy, php-format
-msgid "%s updates favorited by %s / %s."
+msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "Tất cả các cập nhật của %s"
#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
@@ -561,8 +552,11 @@ msgstr "Không tìm thấy"
msgid "No such attachment."
msgstr "Không có tài liệu nào."
-#: actions/avatarbynickname.php:59 actions/grouprss.php:91
-#: actions/leavegroup.php:76
+#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73
+#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
+#: actions/grouplogo.php:86 actions/groupmembers.php:76
+#: actions/grouprss.php:91 actions/joingroup.php:76 actions/leavegroup.php:76
+#: actions/showgroup.php:121
msgid "No nickname."
msgstr "Không có biệt hiệu."
@@ -587,8 +581,8 @@ msgstr ""
"về bạn."
#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
-#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
-#: actions/userauthorization.php:72 actions/userrss.php:103
+#: actions/remotesubscribe.php:191 actions/userauthorization.php:72
+#: actions/userrss.php:103
#, fuzzy
msgid "User without matching profile"
msgstr "Hồ sơ ở nơi khác không khớp với hồ sơ này của bạn"
@@ -623,11 +617,11 @@ msgstr "Tải file"
msgid "Crop"
msgstr "Nhóm"
-#: actions/avatarsettings.php:268 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50
-#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/avatarsettings.php:268 actions/deletenotice.php:157
+#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75
+#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309
#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/othersettings.php:145 actions/passwordsettings.php:138
#: actions/profilesettings.php:194 actions/recoverpassword.php:337
@@ -709,21 +703,16 @@ msgstr "Ban user"
msgid "Failed to save block information."
msgstr ""
-#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
-#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
-#: actions/groupmembers.php:76 actions/joingroup.php:76
-#: actions/showgroup.php:121
-#, fuzzy
-msgid "No nickname"
-msgstr "Không có biệt hiệu."
-
#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
#: actions/grouplogo.php:99 actions/groupmembers.php:83
-#: actions/joingroup.php:83 actions/showgroup.php:137
+#: actions/grouprss.php:98 actions/groupunblock.php:86
+#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86
+#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263
#, fuzzy
-msgid "No such group"
-msgstr "Không có user nào."
+msgid "No such group."
+msgstr "Không có tin nhắn nào."
#: actions/blockedfromgroup.php:90
#, fuzzy, php-format
@@ -732,7 +721,7 @@ msgstr "Hồ sơ"
#: actions/blockedfromgroup.php:93
#, fuzzy, php-format
-msgid "%s blocked profiles, page %d"
+msgid "%1$s blocked profiles, page %2$d"
msgstr "%s và bạn bè"
#: actions/blockedfromgroup.php:108
@@ -848,11 +837,6 @@ msgstr "Không thể xóa tin nhắn này."
msgid "Delete this notice"
msgstr "Xóa tin nhắn"
-#: actions/deletenotice.php:157
-#, fuzzy
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Có lỗi xảy ra khi thao tác. Hãy thử lại lần nữa."
-
#: actions/deleteuser.php:67
#, fuzzy
msgid "You cannot delete users."
@@ -880,7 +864,7 @@ msgid "Delete this user"
msgstr "Xóa tin nhắn"
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
-#: lib/adminpanelaction.php:302 lib/groupnav.php:119
+#: lib/adminpanelaction.php:316 lib/groupnav.php:119
msgid "Design"
msgstr ""
@@ -1037,7 +1021,7 @@ msgstr "Bạn phải đăng nhập vào mới có thể gửi thư mời những
#: actions/editgroup.php:103 actions/editgroup.php:168
#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
#, fuzzy
-msgid "You must be an admin to edit the group"
+msgid "You must be an admin to edit the group."
msgstr "Bạn phải đăng nhập vào mới có thể gửi thư mời những "
#: actions/editgroup.php:154
@@ -1065,7 +1049,8 @@ msgid "Options saved."
msgstr "Đã lưu các điều chỉnh."
#: actions/emailsettings.php:60
-msgid "Email Settings"
+#, fuzzy
+msgid "Email settings"
msgstr "Thiết lập địa chỉ email"
#: actions/emailsettings.php:71
@@ -1103,7 +1088,7 @@ msgstr "Hủy"
#: actions/emailsettings.php:121
#, fuzzy
-msgid "Email Address"
+msgid "Email address"
msgstr "Địa chỉ email"
#: actions/emailsettings.php:123
@@ -1182,9 +1167,9 @@ msgstr "Không có địa chỉ email."
msgid "Cannot normalize that email address"
msgstr "Không thể bình thường hóa địa chỉ GTalk này"
-#: actions/emailsettings.php:331 actions/siteadminpanel.php:157
-#, fuzzy
-msgid "Not a valid email address"
+#: actions/emailsettings.php:331 actions/register.php:201
+#: actions/siteadminpanel.php:157
+msgid "Not a valid email address."
msgstr "Địa chỉ email không hợp lệ."
#: actions/emailsettings.php:334
@@ -1379,20 +1364,12 @@ msgstr "Không biết phiên bản của giao thức OMB."
msgid "Error updating remote profile"
msgstr "Lỗi xảy ra khi cập nhật hồ sơ cá nhân"
-#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
-#: actions/grouprss.php:98 actions/groupunblock.php:86
-#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212
-#: lib/command.php:263
-#, fuzzy
-msgid "No such group."
-msgstr "Không có tin nhắn nào."
-
-#: actions/getfile.php:75
+#: actions/getfile.php:79
#, fuzzy
msgid "No such file."
msgstr "Không có tin nhắn nào."
-#: actions/getfile.php:79
+#: actions/getfile.php:83
#, fuzzy
msgid "Cannot read file."
msgstr "Không có tin nhắn nào."
@@ -1405,7 +1382,7 @@ msgstr ""
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: lib/profileformaction.php:77
+#: actions/unsubscribe.php:84 lib/profileformaction.php:77
#, fuzzy
msgid "No profile with that ID."
msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
@@ -1437,9 +1414,9 @@ msgstr "Ban user"
#: actions/groupblock.php:162
#, php-format
msgid ""
-"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
-"be removed from the group, unable to post, and unable to subscribe to the "
-"group in the future."
+"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
+"will be removed from the group, unable to post, and unable to subscribe to "
+"the group in the future."
msgstr ""
#: actions/groupblock.php:178
@@ -1456,9 +1433,10 @@ msgstr "Ban user"
msgid "Database error blocking user from group."
msgstr ""
-#: actions/groupbyid.php:74
-msgid "No ID"
-msgstr ""
+#: actions/groupbyid.php:74 actions/userbyid.php:70
+#, fuzzy
+msgid "No ID."
+msgstr "Không có id."
#: actions/groupdesignsettings.php:68
#, fuzzy
@@ -1482,13 +1460,6 @@ msgstr ""
msgid "Couldn't update your design."
msgstr "Không thể cập nhật thành viên."
-#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
-#, fuzzy
-msgid "Unable to save your design settings!"
-msgstr "Không thể lưu thông tin Twitter của bạn!"
-
#: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231
#, fuzzy
msgid "Design preferences saved."
@@ -1505,6 +1476,11 @@ msgid ""
"You can upload a logo image for your group. The maximum file size is %s."
msgstr ""
+#: actions/grouplogo.php:178
+#, fuzzy
+msgid "User without matching profile."
+msgstr "Hồ sơ ở nơi khác không khớp với hồ sơ này của bạn"
+
#: actions/grouplogo.php:362
msgid "Pick a square area of the image to be the logo."
msgstr ""
@@ -1525,15 +1501,15 @@ msgid "%s group members"
msgstr "Thành viên"
#: actions/groupmembers.php:96
-#, php-format
-msgid "%s group members, page %d"
-msgstr ""
+#, fuzzy, php-format
+msgid "%1$s group members, page %2$d"
+msgstr "Thành viên"
#: actions/groupmembers.php:111
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107
msgid "Admin"
msgstr ""
@@ -1635,7 +1611,8 @@ msgid "Error removing the block."
msgstr "Lỗi xảy ra khi lưu thành viên."
#: actions/imsettings.php:59
-msgid "IM Settings"
+#, fuzzy
+msgid "IM settings"
msgstr "Cấu hình IM"
#: actions/imsettings.php:70
@@ -1666,7 +1643,8 @@ msgstr ""
"nhận tin nhắn và lời hướng dẫn. (Bạn đã thêm %s vào danh sách bạn thân chưa?)"
#: actions/imsettings.php:124
-msgid "IM Address"
+#, fuzzy
+msgid "IM address"
msgstr "IM"
#: actions/imsettings.php:126
@@ -1729,11 +1707,6 @@ msgstr ""
msgid "That is not your Jabber ID."
msgstr "Đây không phải Jabber ID của bạn."
-#: actions/inbox.php:59
-#, php-format
-msgid "Inbox for %s - page %d"
-msgstr "Hộp thư đến của %s - trang %d"
-
#: actions/inbox.php:62
#, php-format
msgid "Inbox for %s"
@@ -1769,9 +1742,9 @@ msgstr "Gửi thư mời đến những người chưa có tài khoản"
msgid "You are already subscribed to these users:"
msgstr "Bạn đã theo những người này:"
-#: actions/invite.php:131 actions/invite.php:139
-#, php-format
-msgid "%s (%s)"
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315
+#, fuzzy, php-format
+msgid "%1$s (%2$s)"
msgstr "%s (%s)"
#: actions/invite.php:136
@@ -1817,7 +1790,7 @@ msgstr "Tin nhắn cá nhân"
msgid "Optionally add a personal message to the invitation."
msgstr "Không bắt buộc phải thêm thông điệp vào thư mời."
-#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:232
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234
msgid "Send"
msgstr "Gửi"
@@ -1888,19 +1861,9 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "Bạn phải đăng nhập vào mới có thể gửi thư mời những "
-#: actions/joingroup.php:90 lib/command.php:217
-#, fuzzy
-msgid "You are already a member of that group"
-msgstr "Bạn đã theo những người này:"
-
-#: actions/joingroup.php:128 lib/command.php:234
+#: actions/joingroup.php:135
#, fuzzy, php-format
-msgid "Could not join user %s to group %s"
-msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
-
-#: actions/joingroup.php:135 lib/command.php:239
-#, fuzzy, php-format
-msgid "%s joined group %s"
+msgid "%1$s joined group %2$s"
msgstr "%s và nhóm"
#: actions/leavegroup.php:60
@@ -1918,67 +1881,57 @@ msgstr "Bạn chưa cập nhật thông tin riêng"
msgid "Could not find membership record."
msgstr "Không thể cập nhật thành viên."
-#: actions/leavegroup.php:127 lib/command.php:284
+#: actions/leavegroup.php:134
#, fuzzy, php-format
-msgid "Could not remove user %s to group %s"
-msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
-
-#: actions/leavegroup.php:134 lib/command.php:289
-#, fuzzy, php-format
-msgid "%s left group %s"
+msgid "%1$s left group %2$s"
msgstr "%s và nhóm"
-#: actions/login.php:83 actions/register.php:137
+#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
msgid "Already logged in."
msgstr "Đã đăng nhập."
-#: actions/login.php:114 actions/login.php:124
-#, fuzzy
-msgid "Invalid or expired token."
-msgstr "Nội dung tin nhắn không hợp lệ"
-
-#: actions/login.php:147
+#: actions/login.php:126
msgid "Incorrect username or password."
msgstr "Sai tên đăng nhập hoặc mật khẩu."
-#: actions/login.php:153
+#: actions/login.php:132 actions/otp.php:120
#, fuzzy
msgid "Error setting user. You are probably not authorized."
msgstr "Chưa được phép."
-#: actions/login.php:208 actions/login.php:261 lib/action.php:459
+#: actions/login.php:188 actions/login.php:241 lib/action.php:460
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Đăng nhập"
-#: actions/login.php:247
+#: actions/login.php:227
msgid "Login to site"
msgstr ""
-#: actions/login.php:250 actions/profilesettings.php:106
-#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
+#: actions/login.php:230 actions/profilesettings.php:106
+#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
#: lib/groupeditform.php:152 lib/userprofile.php:131
msgid "Nickname"
msgstr "Biệt danh"
-#: actions/login.php:253 actions/register.php:428
+#: actions/login.php:233 actions/register.php:429
#: lib/accountsettingsaction.php:116
msgid "Password"
msgstr "Mật khẩu"
-#: actions/login.php:256 actions/register.php:477
+#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Nhớ tôi"
-#: actions/login.php:257 actions/register.php:479
+#: actions/login.php:237 actions/register.php:480
msgid "Automatically login in the future; not for shared computers!"
msgstr "Sẽ tự động đăng nhập, không dành cho các máy sử dụng chung!"
-#: actions/login.php:267
+#: actions/login.php:247
msgid "Lost or forgotten password?"
msgstr "Mất hoặc quên mật khẩu?"
-#: actions/login.php:286
+#: actions/login.php:266
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1986,7 +1939,7 @@ msgstr ""
"Vì lý do bảo mật, bạn hãy nhập lại tên đăng nhập và mật khẩu trước khi thay "
"đổi trong điều chỉnh."
-#: actions/login.php:290
+#: actions/login.php:270
#, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -2001,19 +1954,19 @@ msgid "Only an admin can make another user an admin."
msgstr ""
#: actions/makeadmin.php:95
-#, php-format
-msgid "%s is already an admin for group \"%s\"."
-msgstr ""
+#, fuzzy, php-format
+msgid "%1$s is already an admin for group \"%2$s\"."
+msgstr "Người dùng không có thông tin."
#: actions/makeadmin.php:132
-#, php-format
-msgid "Can't get membership record for %s in group %s"
-msgstr ""
+#, fuzzy, php-format
+msgid "Can't get membership record for %1$s in group %2$s."
+msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
#: actions/makeadmin.php:145
-#, php-format
-msgid "Can't make %s an admin for group %s"
-msgstr ""
+#, fuzzy, php-format
+msgid "Can't make %1$s an admin for group %2$s."
+msgstr "Bạn phải đăng nhập vào mới có thể gửi thư mời những "
#: actions/microsummary.php:69
msgid "No current status"
@@ -2057,9 +2010,9 @@ msgstr ""
msgid "Message sent"
msgstr "Tin mới nhất"
-#: actions/newmessage.php:185 lib/command.php:376
+#: actions/newmessage.php:185
#, fuzzy, php-format
-msgid "Direct message to %s sent"
+msgid "Direct message to %s sent."
msgstr "Tin nhắn riêng"
#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
@@ -2091,7 +2044,7 @@ msgstr "Chuỗi cần tìm"
#: actions/noticesearch.php:91
#, fuzzy, php-format
-msgid "Search results for \"%s\" on %s"
+msgid "Search results for \"%1$s\" on %2$s"
msgstr " Tìm dòng thông tin cho \"%s\""
#: actions/noticesearch.php:121
@@ -2151,8 +2104,8 @@ msgstr "Kết nối"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031
-#: lib/api.php:1059 lib/api.php:1169
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
+#: lib/api.php:1061 lib/api.php:1171
msgid "Not a supported data format."
msgstr "Không hỗ trợ định dạng dữ liệu này."
@@ -2200,10 +2153,29 @@ msgstr ""
msgid "URL shortening service is too long (max 50 chars)."
msgstr "Tên khu vực quá dài (không quá 255 ký tự)."
-#: actions/outbox.php:58
-#, php-format
-msgid "Outbox for %s - page %d"
-msgstr "Hộp thư gửi đi của %s - trang %d"
+#: actions/otp.php:69
+#, fuzzy
+msgid "No user ID specified."
+msgstr "Thông báo mới"
+
+#: actions/otp.php:83
+#, fuzzy
+msgid "No login token specified."
+msgstr "Thông báo mới"
+
+#: actions/otp.php:90
+#, fuzzy
+msgid "No login token requested."
+msgstr "Không có URL cho hồ sơ để quay về."
+
+#: actions/otp.php:95
+#, fuzzy
+msgid "Invalid login token specified."
+msgstr "Nội dung tin nhắn không hợp lệ"
+
+#: actions/otp.php:104
+msgid "Login token expired."
+msgstr ""
#: actions/outbox.php:61
#, php-format
@@ -2243,7 +2215,7 @@ msgid "6 or more characters"
msgstr "Nhiều hơn 6 ký tự"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:432 actions/smssettings.php:134
+#: actions/register.php:433 actions/smssettings.php:134
msgid "Confirm"
msgstr "Xác nhận"
@@ -2280,7 +2252,7 @@ msgstr "Không thể lưu mật khẩu mới"
msgid "Password saved."
msgstr "Đã lưu mật khẩu."
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326
msgid "Paths"
msgstr ""
@@ -2313,7 +2285,7 @@ msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58
-#: lib/adminpanelaction.php:299
+#: lib/adminpanelaction.php:311
#, fuzzy
msgid "Site"
msgstr "Thư mời"
@@ -2419,8 +2391,9 @@ msgid "When to use SSL"
msgstr ""
#: actions/pathsadminpanel.php:308
-msgid "SSL Server"
-msgstr ""
+#, fuzzy
+msgid "SSL server"
+msgstr "Khôi phục"
#: actions/pathsadminpanel.php:309
msgid "Server to direct SSL requests to"
@@ -2450,9 +2423,9 @@ msgid "Not a valid people tag: %s"
msgstr "Địa chỉ email không hợp lệ."
#: actions/peopletag.php:144
-#, php-format
-msgid "Users self-tagged with %s - page %d"
-msgstr ""
+#, fuzzy, php-format
+msgid "Users self-tagged with %1$s - page %2$d"
+msgstr "Dòng tin nhắn cho %s"
#: actions/postnotice.php:84
msgid "Invalid notice content"
@@ -2460,7 +2433,7 @@ msgstr "Nội dung tin nhắn không hợp lệ"
#: actions/postnotice.php:90
#, php-format
-msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
msgstr ""
#: actions/profilesettings.php:60
@@ -2483,43 +2456,43 @@ msgstr "Hồ sơ này không biết"
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1-64 chữ cái thường hoặc là chữ số, không có dấu chấm hay "
-#: actions/profilesettings.php:111 actions/register.php:447
+#: actions/profilesettings.php:111 actions/register.php:448
#: actions/showgroup.php:247 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:149
msgid "Full name"
msgstr "Tên đầy đủ"
-#: actions/profilesettings.php:115 actions/register.php:452
+#: actions/profilesettings.php:115 actions/register.php:453
#: lib/groupeditform.php:161
msgid "Homepage"
msgstr "Trang chủ hoặc Blog"
-#: actions/profilesettings.php:117 actions/register.php:454
+#: actions/profilesettings.php:117 actions/register.php:455
msgid "URL of your homepage, blog, or profile on another site"
msgstr "URL về Trang chính, Blog, hoặc hồ sơ cá nhân của bạn trên "
-#: actions/profilesettings.php:122 actions/register.php:460
+#: actions/profilesettings.php:122 actions/register.php:461
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "Nói về bạn và những sở thích của bạn khoảng 140 ký tự"
-#: actions/profilesettings.php:125 actions/register.php:463
+#: actions/profilesettings.php:125 actions/register.php:464
#, fuzzy
msgid "Describe yourself and your interests"
msgstr "Nói về bạn và những sở thích của bạn khoảng 140 ký tự"
-#: actions/profilesettings.php:127 actions/register.php:465
+#: actions/profilesettings.php:127 actions/register.php:466
msgid "Bio"
msgstr "Lý lịch"
-#: actions/profilesettings.php:132 actions/register.php:470
+#: actions/profilesettings.php:132 actions/register.php:471
#: actions/showgroup.php:256 actions/tagother.php:112
#: actions/userauthorization.php:158 lib/groupeditform.php:177
#: lib/userprofile.php:164
msgid "Location"
msgstr "Thành phố"
-#: actions/profilesettings.php:134 actions/register.php:472
+#: actions/profilesettings.php:134 actions/register.php:473
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "Bạn ở đâu, \"Thành phố, Tỉnh thành, Quốc gia\""
@@ -2583,21 +2556,21 @@ msgstr "Trang chủ '%s' không hợp lệ"
msgid "Couldn't update user for autosubscribe."
msgstr "Không thể cập nhật thành viên."
-#: actions/profilesettings.php:354
+#: actions/profilesettings.php:359
#, fuzzy
msgid "Couldn't save location prefs."
msgstr "Không thể lưu hồ sơ cá nhân."
-#: actions/profilesettings.php:366
+#: actions/profilesettings.php:371
msgid "Couldn't save profile."
msgstr "Không thể lưu hồ sơ cá nhân."
-#: actions/profilesettings.php:374
+#: actions/profilesettings.php:379
#, fuzzy
msgid "Couldn't save tags."
msgstr "Không thể lưu hồ sơ cá nhân."
-#: actions/profilesettings.php:382 lib/adminpanelaction.php:126
+#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "Đã lưu các điều chỉnh."
@@ -2822,7 +2795,7 @@ msgstr "Lỗi xảy ra khi tạo thành viên."
msgid "New password successfully saved. You are now logged in."
msgstr "Mật khẩu mới đã được lưu. Bạn có thể đăng nhập ngay bây giờ."
-#: actions/register.php:85 actions/register.php:189 actions/register.php:404
+#: actions/register.php:85 actions/register.php:189 actions/register.php:405
msgid "Sorry, only invited people can register."
msgstr ""
@@ -2835,7 +2808,7 @@ msgstr "Lỗi xảy ra với mã xác nhận."
msgid "Registration successful"
msgstr "Đăng ký thành công"
-#: actions/register.php:114 actions/register.php:502 lib/action.php:456
+#: actions/register.php:114 actions/register.php:503 lib/action.php:457
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Đăng ký"
@@ -2849,73 +2822,69 @@ msgstr "Biệt hiệu không được cho phép."
msgid "You can't register if you don't agree to the license."
msgstr "Bạn không thể đăng ký nếu không đồng ý các điều khoản."
-#: actions/register.php:201
-msgid "Not a valid email address."
-msgstr "Địa chỉ email không hợp lệ."
-
#: actions/register.php:212
msgid "Email address already exists."
msgstr "Địa chỉ email đã tồn tại."
-#: actions/register.php:243 actions/register.php:264
+#: actions/register.php:243 actions/register.php:265
msgid "Invalid username or password."
msgstr "Tên đăng nhập hoặc mật khẩu không hợp lệ."
-#: actions/register.php:342
+#: actions/register.php:343
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
-#: actions/register.php:424
+#: actions/register.php:425
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
"1-64 chữ cái thường hoặc là chữ số, không có dấu chấm hay khoảng trắng. Bắt "
"buộc."
-#: actions/register.php:429
+#: actions/register.php:430
msgid "6 or more characters. Required."
msgstr "Nhiều hơn 6 ký tự. Bắt buộc"
-#: actions/register.php:433
+#: actions/register.php:434
msgid "Same as password above. Required."
msgstr "Cùng mật khẩu ở trên. Bắt buộc."
-#: actions/register.php:437 actions/register.php:441
+#: actions/register.php:438 actions/register.php:442
#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "Email"
-#: actions/register.php:438 actions/register.php:442
+#: actions/register.php:439 actions/register.php:443
msgid "Used only for updates, announcements, and password recovery"
msgstr "Chỉ dùng để cập nhật, thông báo, và hồi phục mật khẩu"
-#: actions/register.php:449
+#: actions/register.php:450
msgid "Longer name, preferably your \"real\" name"
msgstr "Họ tên đầy đủ của bạn, tốt nhất là tên thật của bạn."
-#: actions/register.php:493
+#: actions/register.php:494
msgid "My text and files are available under "
msgstr "Ghi chú và các file của tôi đã có ở phía dưới"
-#: actions/register.php:495
+#: actions/register.php:496
msgid "Creative Commons Attribution 3.0"
msgstr ""
-#: actions/register.php:496
+#: actions/register.php:497
#, fuzzy
msgid ""
" except this private data: password, email address, IM address, and phone "
"number."
msgstr " ngoại trừ thông tin riêng: mật khẩu, email, địa chỉ IM, số điện thoại"
-#: actions/register.php:537
-#, php-format
+#: actions/register.php:538
+#, fuzzy, php-format
msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
"want to...\n"
"\n"
-"* Go to [your profile](%s) and post your first message.\n"
+"* Go to [your profile](%2$s) and post your first message.\n"
"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
"notices through instant messages.\n"
"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
@@ -2940,7 +2909,7 @@ msgstr ""
"\n"
"Cảm ơn bạn đã đăng ký để là thành viên và rất mong bạn sẽ thích dịch vụ này."
-#: actions/register.php:561
+#: actions/register.php:562
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3043,11 +3012,6 @@ msgstr "Tạo"
msgid "Replies to %s"
msgstr "Trả lời cho %s"
-#: actions/replies.php:127
-#, fuzzy, php-format
-msgid "Replies to %s, page %d"
-msgstr "Trả lời cho %s"
-
#: actions/replies.php:144
#, fuzzy, php-format
msgid "Replies feed for %s (RSS 1.0)"
@@ -3066,8 +3030,8 @@ msgstr "Dòng tin nhắn cho %s"
#: actions/replies.php:198
#, php-format
msgid ""
-"This is the timeline showing replies to %s but %s hasn't received a notice "
-"to his attention yet."
+"This is the timeline showing replies to %1$s but %2$s hasn't received a "
+"notice to his attention yet."
msgstr ""
#: actions/replies.php:203
@@ -3080,8 +3044,8 @@ msgstr ""
#: actions/replies.php:205
#, php-format
msgid ""
-"You can try to [nudge %s](../%s) or [post something to his or her attention]"
-"(%%%%action.newnotice%%%%?status_textarea=%s)."
+"You can try to [nudge %1$s](../%2$s) or [post something to his or her "
+"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
#: actions/repliesrss.php:72
@@ -3099,11 +3063,6 @@ msgstr "Bạn đã theo những người này:"
msgid "User is already sandboxed."
msgstr "Người dùng không có thông tin."
-#: actions/showfavorites.php:79
-#, fuzzy, php-format
-msgid "%s's favorite notices, page %d"
-msgstr "%s ưa thích các tin nhắn"
-
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr "Không thể lấy lại các tin nhắn ưa thích"
@@ -3153,11 +3112,6 @@ msgstr ""
msgid "%s group"
msgstr "%s và nhóm"
-#: actions/showgroup.php:84
-#, php-format
-msgid "%s group, page %d"
-msgstr ""
-
#: actions/showgroup.php:218
#, fuzzy
msgid "Group profile"
@@ -3209,7 +3163,7 @@ msgstr "Thành viên"
#: actions/showgroup.php:386 lib/profileaction.php:117
#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
-#: lib/tagcloudsection.php:71
+#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71
msgid "(None)"
msgstr ""
@@ -3279,14 +3233,9 @@ msgstr "Tin đã gửi"
msgid " tagged %s"
msgstr "Thông báo được gắn thẻ %s"
-#: actions/showstream.php:79
-#, fuzzy, php-format
-msgid "%s, page %d"
-msgstr "Hộp thư đến của %s - trang %d"
-
#: actions/showstream.php:122
#, fuzzy, php-format
-msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
msgstr "Dòng tin nhắn cho %s"
#: actions/showstream.php:129
@@ -3311,7 +3260,7 @@ msgstr "Hộp thư đi của %s"
#: actions/showstream.php:191
#, php-format
-msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
msgstr ""
#: actions/showstream.php:196
@@ -3323,8 +3272,8 @@ msgstr ""
#: actions/showstream.php:198
#, php-format
msgid ""
-"You can try to nudge %s or [post something to his or her attention](%%%%"
-"action.newnotice%%%%?status_textarea=%s)."
+"You can try to nudge %1$s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%2$s)."
msgstr ""
#: actions/showstream.php:234
@@ -3369,12 +3318,12 @@ msgstr ""
#: actions/siteadminpanel.php:154
#, fuzzy
-msgid "You must have a valid contact email address"
+msgid "You must have a valid contact email address."
msgstr "Địa chỉ email không hợp lệ."
#: actions/siteadminpanel.php:172
#, php-format
-msgid "Unknown language \"%s\""
+msgid "Unknown language \"%s\"."
msgstr ""
#: actions/siteadminpanel.php:179
@@ -3564,7 +3513,8 @@ msgid "Save site settings"
msgstr "Thay đổi hình đại diện"
#: actions/smssettings.php:58
-msgid "SMS Settings"
+#, fuzzy
+msgid "SMS settings"
msgstr "Thiết lập SMS"
#: actions/smssettings.php:69
@@ -3596,7 +3546,8 @@ msgid "Enter the code you received on your phone."
msgstr "Nhập mã mà bạn nhận được trên điện thoại của bạn."
#: actions/smssettings.php:138
-msgid "SMS Phone number"
+#, fuzzy
+msgid "SMS phone number"
msgstr "Số điện thoại để nhắn SMS "
#: actions/smssettings.php:140
@@ -3698,7 +3649,7 @@ msgstr "Bạn này theo tôi"
#: actions/subscribers.php:52
#, fuzzy, php-format
-msgid "%s subscribers, page %d"
+msgid "%1$s subscribers, page %2$d"
msgstr "Theo tôi"
#: actions/subscribers.php:63
@@ -3735,7 +3686,7 @@ msgstr "Tất cả đăng nhận"
#: actions/subscriptions.php:54
#, fuzzy, php-format
-msgid "%s subscriptions, page %d"
+msgid "%1$s subscriptions, page %2$d"
msgstr "Tất cả đăng nhận"
#: actions/subscriptions.php:65
@@ -3771,11 +3722,6 @@ msgstr "Không có Jabber ID."
msgid "SMS"
msgstr "SMS"
-#: actions/tag.php:68
-#, fuzzy, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "Dòng tin nhắn cho %s"
-
#: actions/tag.php:86
#, fuzzy, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
@@ -3864,11 +3810,6 @@ msgstr "Người dùng không có thông tin."
msgid "No profile id in request."
msgstr "Không có URL cho hồ sơ để quay về."
-#: actions/unsubscribe.php:84
-#, fuzzy
-msgid "No profile with that id."
-msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
-
#: actions/unsubscribe.php:98
#, fuzzy
msgid "Unsubscribed"
@@ -3876,10 +3817,11 @@ msgstr "Hết theo"
#: actions/updateprofile.php:62 actions/userauthorization.php:330
#, php-format
-msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+msgid ""
+"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
msgstr ""
-#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305
+#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321
#: lib/personalgroupnav.php:115
msgid "User"
msgstr ""
@@ -3986,7 +3928,7 @@ msgstr ""
"nhắn của các thành viên này. Nếu bạn không yêu cầu đăng nhận xem tin nhắn "
"của họ, hãy nhấn \"Hủy bỏ\""
-#: actions/userauthorization.php:188
+#: actions/userauthorization.php:188 actions/version.php:165
msgid "License"
msgstr ""
@@ -4044,7 +3986,7 @@ msgstr ""
#: actions/userauthorization.php:296
#, php-format
-msgid "Listener URI ‘%s’ not found here"
+msgid "Listener URI ‘%s’ not found here."
msgstr ""
#: actions/userauthorization.php:301
@@ -4077,11 +4019,6 @@ msgstr "Không thể đọc URL cho hình đại diện '%s'"
msgid "Wrong image type for avatar URL ‘%s’."
msgstr "Kiểu file ảnh không phù hợp với '%s'"
-#: actions/userbyid.php:70
-#, fuzzy
-msgid "No ID."
-msgstr "Không có id."
-
#: actions/userdesignsettings.php:76 lib/designsettings.php:65
#, fuzzy
msgid "Profile design"
@@ -4097,11 +4034,6 @@ msgstr ""
msgid "Enjoy your hotdog!"
msgstr ""
-#: actions/usergroups.php:64
-#, php-format
-msgid "%s groups, page %d"
-msgstr ""
-
#: actions/usergroups.php:130
msgid "Search for more groups"
msgstr ""
@@ -4116,23 +4048,94 @@ msgstr "Bạn chưa cập nhật thông tin riêng"
msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
msgstr ""
-#: classes/File.php:137
+#: actions/version.php:73
+#, fuzzy, php-format
+msgid "StatusNet %s"
+msgstr "Số liệu thống kê"
+
+#: actions/version.php:153
+#, php-format
+msgid ""
+"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"Inc. and contributors."
+msgstr ""
+
+#: actions/version.php:157
+#, fuzzy
+msgid "StatusNet"
+msgstr "Hình đại diện đã được cập nhật."
+
+#: actions/version.php:161
+msgid "Contributors"
+msgstr ""
+
+#: actions/version.php:168
+msgid ""
+"StatusNet is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU Affero General Public License as published by the Free "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"any later version. "
+msgstr ""
+
+#: actions/version.php:174
+msgid ""
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License "
+"for more details. "
+msgstr ""
+
+#: actions/version.php:180
+#, php-format
+msgid ""
+"You should have received a copy of the GNU Affero General Public License "
+"along with this program. If not, see %s."
+msgstr ""
+
+#: actions/version.php:189
+msgid "Plugins"
+msgstr ""
+
+#: actions/version.php:195
+#, fuzzy
+msgid "Name"
+msgstr "Biệt danh"
+
+#: actions/version.php:196 lib/action.php:741
+#, fuzzy
+msgid "Version"
+msgstr "Cá nhân"
+
+#: actions/version.php:197
+msgid "Author(s)"
+msgstr ""
+
+#: actions/version.php:198 lib/groupeditform.php:172
+msgid "Description"
+msgstr "Mô tả"
+
+#: classes/File.php:144
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
"to upload a smaller version."
msgstr ""
-#: classes/File.php:147
+#: classes/File.php:154
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:154
+#: classes/File.php:161
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
+#: classes/Login_token.php:76
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "Không thể tạo favorite."
+
#: classes/Message.php:45
#, fuzzy
msgid "You are banned from sending direct messages."
@@ -4187,7 +4190,7 @@ msgstr "Có lỗi xảy ra khi lưu tin nhắn."
msgid "DB error inserting reply: %s"
msgstr "Lỗi cơ sở dữ liệu khi chèn trả lời: %s"
-#: classes/Notice.php:1361
+#: classes/Notice.php:1359
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%s (%s)"
@@ -4240,147 +4243,147 @@ msgstr ""
#: lib/action.php:144
#, fuzzy, php-format
-msgid "%s - %s"
+msgid "%1$s - %2$s"
msgstr "%s (%s)"
#: lib/action.php:159
msgid "Untitled page"
msgstr ""
-#: lib/action.php:426
+#: lib/action.php:427
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Home"
msgstr "Trang chủ"
-#: lib/action.php:432
+#: lib/action.php:433
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:434
+#: lib/action.php:435
#, fuzzy
msgid "Account"
msgstr "Giới thiệu"
-#: lib/action.php:434
+#: lib/action.php:435
#, fuzzy
msgid "Change your email, avatar, password, profile"
msgstr "Thay đổi mật khẩu của bạn"
-#: lib/action.php:437
+#: lib/action.php:438
msgid "Connect"
msgstr "Kết nối"
-#: lib/action.php:437
+#: lib/action.php:438
#, fuzzy
msgid "Connect to services"
msgstr "Không thể chuyển đến máy chủ: %s"
-#: lib/action.php:441
+#: lib/action.php:442
#, fuzzy
msgid "Change site configuration"
msgstr "Tôi theo"
-#: lib/action.php:445 lib/subgroupnav.php:105
+#: lib/action.php:446 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Thư mời"
-#: lib/action.php:446 lib/subgroupnav.php:106
+#: lib/action.php:447 lib/subgroupnav.php:106
#, fuzzy, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
"Điền địa chỉ email và nội dung tin nhắn để gửi thư mời bạn bè và đồng nghiệp "
"của bạn tham gia vào dịch vụ này."
-#: lib/action.php:451
+#: lib/action.php:452
msgid "Logout"
msgstr "Thoát"
-#: lib/action.php:451
+#: lib/action.php:452
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:456
+#: lib/action.php:457
#, fuzzy
msgid "Create an account"
msgstr "Tạo tài khoản mới"
-#: lib/action.php:459
+#: lib/action.php:460
msgid "Login to the site"
msgstr ""
-#: lib/action.php:462 lib/action.php:725
+#: lib/action.php:463 lib/action.php:726
msgid "Help"
msgstr "Hướng dẫn"
-#: lib/action.php:462
+#: lib/action.php:463
#, fuzzy
msgid "Help me!"
msgstr "Hướng dẫn"
-#: lib/action.php:465 lib/searchaction.php:127
+#: lib/action.php:466 lib/searchaction.php:127
msgid "Search"
msgstr "Tìm kiếm"
-#: lib/action.php:465
+#: lib/action.php:466
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:486
+#: lib/action.php:487
#, fuzzy
msgid "Site notice"
msgstr "Thông báo mới"
-#: lib/action.php:552
+#: lib/action.php:553
msgid "Local views"
msgstr ""
-#: lib/action.php:618
+#: lib/action.php:619
#, fuzzy
msgid "Page notice"
msgstr "Thông báo mới"
-#: lib/action.php:720
+#: lib/action.php:721
#, fuzzy
msgid "Secondary site navigation"
msgstr "Tôi theo"
-#: lib/action.php:727
+#: lib/action.php:728
msgid "About"
msgstr "Giới thiệu"
-#: lib/action.php:729
+#: lib/action.php:730
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:733
+#: lib/action.php:734
msgid "TOS"
msgstr ""
-#: lib/action.php:736
+#: lib/action.php:737
msgid "Privacy"
msgstr "Riêng tư"
-#: lib/action.php:738
+#: lib/action.php:739
msgid "Source"
msgstr "Nguồn"
-#: lib/action.php:740
+#: lib/action.php:743
msgid "Contact"
msgstr "Liên hệ"
-#: lib/action.php:742
+#: lib/action.php:745
#, fuzzy
msgid "Badge"
msgstr "Tin đã gửi"
-#: lib/action.php:770
+#: lib/action.php:773
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:773
+#: lib/action.php:776
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4389,12 +4392,12 @@ msgstr ""
"**%%site.name%%** là dịch vụ gửi tin nhắn được cung cấp từ [%%site.broughtby%"
"%](%%site.broughtbyurl%%). "
-#: lib/action.php:775
+#: lib/action.php:778
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** là dịch vụ gửi tin nhắn. "
-#: lib/action.php:777
+#: lib/action.php:780
#, fuzzy, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4405,34 +4408,34 @@ msgstr ""
"quyền [GNU Affero General Public License](http://www.fsf.org/licensing/"
"licenses/agpl-3.0.html)."
-#: lib/action.php:791
+#: lib/action.php:794
#, fuzzy
msgid "Site content license"
msgstr "Tìm theo nội dung của tin nhắn"
-#: lib/action.php:800
+#: lib/action.php:803
msgid "All "
msgstr ""
-#: lib/action.php:805
+#: lib/action.php:808
msgid "license."
msgstr ""
-#: lib/action.php:1099
+#: lib/action.php:1102
msgid "Pagination"
msgstr ""
-#: lib/action.php:1108
+#: lib/action.php:1111
#, fuzzy
msgid "After"
msgstr "Sau"
-#: lib/action.php:1116
+#: lib/action.php:1119
#, fuzzy
msgid "Before"
msgstr "Trước"
-#: lib/action.php:1164
+#: lib/action.php:1167
#, fuzzy
msgid "There was a problem with your session token."
msgstr "Có lỗi xảy ra khi thao tác. Hãy thử lại lần nữa."
@@ -4442,30 +4445,35 @@ msgstr "Có lỗi xảy ra khi thao tác. Hãy thử lại lần nữa."
msgid "You cannot make changes to this site."
msgstr "Bạn đã theo những người này:"
-#: lib/adminpanelaction.php:195
+#: lib/adminpanelaction.php:107
+#, fuzzy
+msgid "Changes to that panel are not allowed."
+msgstr "Biệt hiệu không được cho phép."
+
+#: lib/adminpanelaction.php:206
msgid "showForm() not implemented."
msgstr ""
-#: lib/adminpanelaction.php:224
+#: lib/adminpanelaction.php:235
msgid "saveSettings() not implemented."
msgstr ""
-#: lib/adminpanelaction.php:247
+#: lib/adminpanelaction.php:258
#, fuzzy
msgid "Unable to delete design setting."
msgstr "Không thể lưu thông tin Twitter của bạn!"
-#: lib/adminpanelaction.php:300
+#: lib/adminpanelaction.php:312
#, fuzzy
msgid "Basic site configuration"
msgstr "Xac nhan dia chi email"
-#: lib/adminpanelaction.php:303
+#: lib/adminpanelaction.php:317
#, fuzzy
msgid "Design configuration"
msgstr "Xác nhận SMS"
-#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309
+#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327
#, fuzzy
msgid "Paths configuration"
msgstr "Xác nhận SMS"
@@ -4506,7 +4514,7 @@ msgstr "Đã lưu mật khẩu."
msgid "Command results"
msgstr "Không có kết quả nào"
-#: lib/channel.php:210
+#: lib/channel.php:210 lib/mailhandler.php:142
msgid "Command complete"
msgstr ""
@@ -4542,8 +4550,9 @@ msgid ""
msgstr ""
#: lib/command.php:152 lib/command.php:399 lib/command.php:460
+#, fuzzy
msgid "Notice with that id does not exist"
-msgstr ""
+msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
#: lib/command.php:168 lib/command.php:415 lib/command.php:476
#: lib/command.php:532
@@ -4556,22 +4565,42 @@ msgstr "Người dùng không có thông tin."
msgid "Notice marked as fave."
msgstr "Tin nhắn này đã có trong danh sách tin nhắn ưa thích của bạn rồi!"
-#: lib/command.php:315
+#: lib/command.php:217
+#, fuzzy
+msgid "You are already a member of that group"
+msgstr "Bạn đã theo những người này:"
+
+#: lib/command.php:234
#, fuzzy, php-format
-msgid "%1$s (%2$s)"
-msgstr "%s (%s)"
+msgid "Could not join user %s to group %s"
+msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
+
+#: lib/command.php:239
+#, fuzzy, php-format
+msgid "%s joined group %s"
+msgstr "%s và nhóm"
+
+#: lib/command.php:284
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s"
+msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
+
+#: lib/command.php:289
+#, fuzzy, php-format
+msgid "%s left group %s"
+msgstr "%s và nhóm"
#: lib/command.php:318
#, fuzzy, php-format
msgid "Fullname: %s"
msgstr "Tên đầy đủ"
-#: lib/command.php:321
+#: lib/command.php:321 lib/mail.php:254
#, fuzzy, php-format
msgid "Location: %s"
msgstr "Thành phố: %s"
-#: lib/command.php:324
+#: lib/command.php:324 lib/mail.php:256
#, fuzzy, php-format
msgid "Homepage: %s"
msgstr "Trang chủ hoặc Blog: %s"
@@ -4581,19 +4610,25 @@ msgstr "Trang chủ hoặc Blog: %s"
msgid "About: %s"
msgstr "Giới thiệu"
-#: lib/command.php:358 scripts/xmppdaemon.php:301
+#: lib/command.php:358
#, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
msgstr ""
+#: lib/command.php:376
+#, fuzzy, php-format
+msgid "Direct message to %s sent"
+msgstr "Tin nhắn riêng"
+
#: lib/command.php:378
#, fuzzy
msgid "Error sending direct message."
msgstr "Thư bạn đã gửi"
#: lib/command.php:422
+#, fuzzy
msgid "Cannot repeat your own notice"
-msgstr ""
+msgstr "Bạn không thể đăng ký nếu không đồng ý các điều khoản."
#: lib/command.php:427
#, fuzzy
@@ -4669,47 +4704,42 @@ msgstr ""
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:664
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Không thể tạo favorite."
-
-#: lib/command.php:669
+#: lib/command.php:661
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:685
+#: lib/command.php:677
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Bạn chưa cập nhật thông tin riêng"
-#: lib/command.php:687
+#: lib/command.php:679
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Bạn đã theo những người này:"
-#: lib/command.php:707
+#: lib/command.php:699
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Không thể tạo favorite."
-#: lib/command.php:709
+#: lib/command.php:701
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Không thể tạo favorite."
-#: lib/command.php:729
+#: lib/command.php:721
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Bạn chưa cập nhật thông tin riêng"
-#: lib/command.php:731
+#: lib/command.php:723
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Bạn chưa cập nhật thông tin riêng"
-#: lib/command.php:745
+#: lib/command.php:737
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4876,10 +4906,6 @@ msgstr "Nói về những sở thích của nhóm trong vòng 140 ký tự"
msgid "Describe the group or topic in %d characters"
msgstr "Nói về những sở thích của nhóm trong vòng 140 ký tự"
-#: lib/groupeditform.php:172
-msgid "Description"
-msgstr "Mô tả"
-
#: lib/groupeditform.php:179
#, fuzzy
msgid ""
@@ -5071,22 +5097,10 @@ msgstr ""
"Người bạn trung thành của bạn,\n"
"%4$s.\n"
-#: lib/mail.php:254
-#, fuzzy, php-format
-msgid "Location: %s\n"
-msgstr "Thành phố: %s\n"
-
-#: lib/mail.php:256
-#, fuzzy, php-format
-msgid "Homepage: %s\n"
-msgstr "Trang chủ hoặc Blog: %s\n"
-
#: lib/mail.php:258
-#, php-format
-msgid ""
-"Bio: %s\n"
-"\n"
-msgstr ""
+#, fuzzy, php-format
+msgid "Bio: %s"
+msgstr "Thành phố: %s"
#: lib/mail.php:286
#, php-format
@@ -5256,6 +5270,28 @@ msgstr ""
msgid "from"
msgstr " từ "
+#: lib/mailhandler.php:37
+#, fuzzy
+msgid "Could not parse message."
+msgstr "Không thể cập nhật thành viên."
+
+#: lib/mailhandler.php:42
+msgid "Not a registered user."
+msgstr "Không có người dùng nào đăng ký"
+
+#: lib/mailhandler.php:46
+msgid "Sorry, that is not your incoming email address."
+msgstr "Xin lỗi, đó không phải là địa chỉ email mà bạn nhập vào."
+
+#: lib/mailhandler.php:50
+msgid "Sorry, no incoming email allowed."
+msgstr "Xin lỗi, không có địa chỉ email cho phép."
+
+#: lib/mailhandler.php:228
+#, fuzzy, php-format
+msgid "Unsupported message type: %s"
+msgstr "Không hỗ trợ kiểu file ảnh này."
+
#: lib/mediafile.php:98 lib/mediafile.php:123
msgid "There was a database error while saving your file. Please try again."
msgstr ""
@@ -5287,7 +5323,7 @@ msgid "File upload stopped by extension."
msgstr ""
#: lib/mediafile.php:179 lib/mediafile.php:216
-msgid "File exceeds user's quota!"
+msgid "File exceeds user's quota."
msgstr ""
#: lib/mediafile.php:196 lib/mediafile.php:233
@@ -5295,7 +5331,8 @@ msgid "File could not be moved to destination directory."
msgstr ""
#: lib/mediafile.php:201 lib/mediafile.php:237
-msgid "Could not determine file's mime-type!"
+#, fuzzy
+msgid "Could not determine file's MIME type."
msgstr "Không thể lấy lại các tin nhắn ưa thích"
#: lib/mediafile.php:270
@@ -5305,7 +5342,7 @@ msgstr ""
#: lib/mediafile.php:275
#, php-format
-msgid "%s is not a supported filetype on this server."
+msgid "%s is not a supported file type on this server."
msgstr ""
#: lib/messageform.php:120
@@ -5341,7 +5378,17 @@ msgid "Attach a file"
msgstr ""
#: lib/noticeform.php:212
-msgid "Share your location"
+#, fuzzy
+msgid "Share my location"
+msgstr "Không thể lưu hồ sơ cá nhân."
+
+#: lib/noticeform.php:214
+#, fuzzy
+msgid "Do not share my location"
+msgstr "Không thể lưu hồ sơ cá nhân."
+
+#: lib/noticeform.php:215
+msgid "Hide this info"
msgstr ""
#: lib/noticelist.php:428
@@ -5467,6 +5514,11 @@ msgstr "Thư bạn đã gửi"
msgid "Tags in %s's notices"
msgstr "cảnh báo tin nhắn"
+#: lib/plugin.php:114
+#, fuzzy
+msgid "Unknown"
+msgstr "Không tìm thấy action"
+
#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "Tôi theo bạn này"
@@ -5656,10 +5708,6 @@ msgstr ""
msgid "People Tagcloud as tagged"
msgstr ""
-#: lib/subscriptionlist.php:126
-msgid "(none)"
-msgstr ""
-
#: lib/tagcloudsection.php:56
#, fuzzy
msgid "None"
@@ -5729,47 +5777,47 @@ msgstr "Tin mới nhất"
msgid "Moderate"
msgstr ""
-#: lib/util.php:837
+#: lib/util.php:884
msgid "a few seconds ago"
msgstr "vài giây trước"
-#: lib/util.php:839
+#: lib/util.php:886
msgid "about a minute ago"
msgstr "1 phút trước"
-#: lib/util.php:841
+#: lib/util.php:888
#, php-format
msgid "about %d minutes ago"
msgstr "%d phút trước"
-#: lib/util.php:843
+#: lib/util.php:890
msgid "about an hour ago"
msgstr "1 giờ trước"
-#: lib/util.php:845
+#: lib/util.php:892
#, php-format
msgid "about %d hours ago"
msgstr "%d giờ trước"
-#: lib/util.php:847
+#: lib/util.php:894
msgid "about a day ago"
msgstr "1 ngày trước"
-#: lib/util.php:849
+#: lib/util.php:896
#, php-format
msgid "about %d days ago"
msgstr "%d ngày trước"
-#: lib/util.php:851
+#: lib/util.php:898
msgid "about a month ago"
msgstr "1 tháng trước"
-#: lib/util.php:853
+#: lib/util.php:900
#, php-format
msgid "about %d months ago"
msgstr "%d tháng trước"
-#: lib/util.php:855
+#: lib/util.php:902
msgid "about a year ago"
msgstr "1 năm trước"
@@ -5783,19 +5831,7 @@ msgstr "Trang chủ không phải là URL"
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
-#: scripts/maildaemon.php:48
-#, fuzzy
-msgid "Could not parse message."
-msgstr "Không thể cập nhật thành viên."
-
-#: scripts/maildaemon.php:53
-msgid "Not a registered user."
-msgstr "Không có người dùng nào đăng ký"
-
-#: scripts/maildaemon.php:57
-msgid "Sorry, that is not your incoming email address."
-msgstr "Xin lỗi, đó không phải là địa chỉ email mà bạn nhập vào."
-
-#: scripts/maildaemon.php:61
-msgid "Sorry, no incoming email allowed."
-msgstr "Xin lỗi, không có địa chỉ email cho phép."
+#: scripts/xmppdaemon.php:301
+#, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr ""