diff options
author | Zach Copley <zach@status.net> | 2009-11-10 15:25:43 -0800 |
---|---|---|
committer | Zach Copley <zach@status.net> | 2009-11-10 15:25:43 -0800 |
commit | db64b612961c37477d0729e9ff4f882fb5df7b8d (patch) | |
tree | 9ae5a31b58a289fc838c29c34230edd3962c231f /locale/vi/LC_MESSAGES | |
parent | ee3fc8ba03ddd8451cac60547af72ea2cef7dc6a (diff) | |
parent | 91332cdadc20e721c22fcf22ca1773cedbde95c5 (diff) |
Merge branch '0.9.x' into finish-account-api
* 0.9.x:
Added a events for the settings menu items
Bringing Sphinx search support up to code: broken out to a plugin, now supports multiple sites on a single server.
Changed to Evan's event style and added an AuthPlugin superclass
add geo output to statuses in json, xml, atom, rss in API
Localisation updates from translatewiki.net (2009-11-10)
Localisation updates from translatewiki.net
Update pot
add lat and long parameters to api/statuses/update
change credential check to work more like other events
fixup output of object attributes in db error code
Performance fix for subscription/subscriber lists based on feedback from ops.
Adjusting indexes to make favorites query more efficient, based on feedback from ops.
Revert untested code; spews PHP notice warnings on every page view: "just sent a http 200 for the check-fancy from install.php"
Added hook for the Group navigation items
Updated block @title text (shouldn't say from group)
Updated group block markup
Revert "Remove more contractions"
Diffstat (limited to 'locale/vi/LC_MESSAGES')
-rw-r--r-- | locale/vi/LC_MESSAGES/statusnet.mo | bin | 66939 -> 67147 bytes | |||
-rw-r--r-- | locale/vi/LC_MESSAGES/statusnet.po | 145 |
2 files changed, 78 insertions, 67 deletions
diff --git a/locale/vi/LC_MESSAGES/statusnet.mo b/locale/vi/LC_MESSAGES/statusnet.mo Binary files differindex df6915cec..bb42fbee7 100644 --- a/locale/vi/LC_MESSAGES/statusnet.mo +++ b/locale/vi/LC_MESSAGES/statusnet.mo diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po index b7bc3231a..f1b61c263 100644 --- a/locale/vi/LC_MESSAGES/statusnet.po +++ b/locale/vi/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:59:01+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:55+0000\n" "Language-Team: Vietnamese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: vi\n" "X-Message-Group: out-statusnet\n" @@ -488,7 +488,7 @@ msgid "Invalid size." msgstr "Kích thước không hợp lệ." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "Hình đại diện" @@ -541,7 +541,7 @@ msgstr "Nhóm" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -643,7 +643,7 @@ msgstr "" 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/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 #, fuzzy msgid "Block user" msgstr "Ban user" @@ -656,23 +656,24 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "Không" #: actions/block.php:149 #, fuzzy -msgid "Do not block this user from this group" -msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi." +msgid "Do not block this user" +msgstr "Bỏ chặn người dùng này" #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "Có" -#: actions/block.php:150 +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 #, fuzzy -msgid "Block this user from this group" +msgid "Block this user" msgstr "Ban user" #: actions/block.php:165 @@ -1190,7 +1191,7 @@ msgstr "Bạn chưa cập nhật thông tin riêng" msgid "Block user from group" msgstr "Ban user" -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1198,7 +1199,17 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +#, fuzzy +msgid "Do not block this user from this group" +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/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "Ban user" + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1265,7 +1276,7 @@ msgstr "Hình đại diện đã được cập nhật." msgid "Failed updating logo." msgstr "Cập nhật hình đại diện không thành công." -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, fuzzy, php-format msgid "%s group members" msgstr "Thành viên" @@ -1279,7 +1290,7 @@ msgstr "" msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "" @@ -1287,11 +1298,6 @@ msgstr "" msgid "Block" msgstr "" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -#, fuzzy -msgid "Block this user" -msgstr "Ban user" - #: actions/groupmembers.php:441 #, fuzzy msgid "Make user an admin of the group" @@ -1713,7 +1719,7 @@ msgid "Nickname" msgstr "Biệt danh" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "Mật khẩu" @@ -1967,63 +1973,68 @@ msgstr "" msgid "Change password" msgstr "Đổi mật khẩu" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "Thay đổi mật khẩu của bạn" + +#: actions/passwordsettings.php:82 #, fuzzy msgid "Change your password." msgstr "Thay đổi mật khẩu của bạn" -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "Đã lưu mật khẩu." -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "Mật khẩu cũ" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "Mật khẩu mới" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "Nhiều hơn 6 ký tự" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Xác nhận" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "cùng mật khẩu ở trên" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "Thay đổi" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 #, fuzzy msgid "Password must be 6 or more characters." msgstr "Mật khẩu phải nhiều hơn 6 ký tự." -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "Mật khẩu không khớp." -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "Mật khẩu cũ sai" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "Lỗi xảy ra khi lưu thành viên; không hợp lệ." -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Không thể lưu mật khẩu mới" -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Đã lưu mật khẩu." @@ -2469,7 +2480,7 @@ 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 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "Email" @@ -2697,7 +2708,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, fuzzy, php-format msgid "%s group" msgstr "%s và nhóm" @@ -2752,7 +2763,7 @@ msgstr "Dòng tin nhắn cho %s" msgid "FOAF for %s group" msgstr "Hộp thư đi của %s" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 msgid "Members" msgstr "Thành viên" @@ -3414,42 +3425,42 @@ msgstr "Lỗi cơ sở dữ liệu khi chèn trả lời: %s" msgid "Welcome to %1$s, @%2$s!" msgstr "%s chào mừng bạn " -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Hồ sơ " -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "Thay đổi các thiết lập trong hồ sơ cá nhân của bạn" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 #, fuzzy msgid "Upload an avatar" msgstr "Cập nhật hình đại diện không thành công." -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "Thay đổi mật khẩu của bạn" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "Đang thực hiện việc thay đổi email" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "Hồ sơ" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 #, fuzzy msgid "Other" msgstr "Sau" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "" @@ -4068,36 +4079,36 @@ msgstr "Bạn ở đâu, \"Thành phố, Tỉnh thành, Quốc gia\"" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "Nhóm" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "Ban user" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "Ban user" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 #, fuzzy msgid "Logo" msgstr "Thoát" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, php-format msgid "Add or edit %s design" msgstr "" @@ -4322,7 +4333,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4346,7 +4357,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4778,47 +4789,47 @@ msgstr "Bạn đã theo những người này:" msgid "Message" msgstr "Tin mới nhất" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "vài giây trước" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "1 phút trước" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "%d phút trước" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "1 giờ trước" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "%d giờ trước" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "1 ngày trước" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "%d ngày trước" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "1 tháng trước" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "%d tháng trước" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "1 năm trước" |