diff options
author | Zach Copley <zach@status.net> | 2009-12-03 12:51:21 -0800 |
---|---|---|
committer | Zach Copley <zach@status.net> | 2009-12-03 12:51:21 -0800 |
commit | bf4ed35a90d5cc906dbae7c097551fb3a10f14d6 (patch) | |
tree | 6e4e4c172865c81ca8bc05672cd5e5f9256fc0fb /locale/vi/LC_MESSAGES | |
parent | 7ed3328c47ee9aac1d7663bce0c6c6349f7b2570 (diff) | |
parent | 9e0f89ba4ff1695c0137faa89c08f8b5c60050ac (diff) |
Merge branch '0.9.x'
* 0.9.x: (141 commits)
Reload the admin design panel page to show the new CSS when the
Only pick up new default site colors if the theme has NOT changed.
Delete design when user chooses to restore default design, instead
Localisation updates for !StatusNet from !translatewiki.net !sntrans
Do not rebuild/add .mo files by default
If an XHR notice is sent form a page that has no timeline, show a
Revert "If the page doesn't have .notices, silently skip the notice XHR response"
Revert "Clear/reset the XHR notice form on pages where there is no timeline"
Clear/reset the XHR notice form on pages where there is no timeline
If the page doesn't have .notices, silently skip the notice XHR response
Remove useless debugging statement
Moved form control styles (i.e., border and radius) out of base
add pluginhandler to list of daemons to shut down
Using box-shadow only on the current navigation item
Updated theme readme
Fix regression in password settings: users have been unable to change their passwords since introduction of ChangePassword event (later StartChangePassword) November 5 in commit d6ddb84132d7b9510ba82064c67f2a39822dab49
Ticket 2048: make OMB posting HTTP timeout configurable as $config['omb']['timeout']; defaults to 5 seconds instead of 20-second default in Yadis library
ticket 1100: add Drupal source link
Fix makefile wildcards for locale compilation (now works on Ubuntu 8.04)
typo fix: '$this' now spelled correctly. Looks like this'll fix acceptance of 'source' param for direct messages posted to API
...
Conflicts:
js/util.js
locale/ar/LC_MESSAGES/statusnet.po
locale/bg/LC_MESSAGES/statusnet.po
locale/ca/LC_MESSAGES/statusnet.po
locale/cs/LC_MESSAGES/statusnet.po
locale/de/LC_MESSAGES/statusnet.po
locale/el/LC_MESSAGES/statusnet.po
locale/en_GB/LC_MESSAGES/statusnet.po
locale/es/LC_MESSAGES/statusnet.po
locale/fi/LC_MESSAGES/statusnet.po
locale/fr/LC_MESSAGES/statusnet.po
locale/ga/LC_MESSAGES/statusnet.po
locale/he/LC_MESSAGES/statusnet.po
locale/is/LC_MESSAGES/statusnet.po
locale/it/LC_MESSAGES/statusnet.po
locale/ja/LC_MESSAGES/statusnet.po
locale/ko/LC_MESSAGES/statusnet.po
locale/mk/LC_MESSAGES/statusnet.po
locale/nb/LC_MESSAGES/statusnet.po
locale/nl/LC_MESSAGES/statusnet.po
locale/nn/LC_MESSAGES/statusnet.po
locale/pl/LC_MESSAGES/statusnet.po
locale/pt/LC_MESSAGES/statusnet.po
locale/pt_BR/LC_MESSAGES/statusnet.po
locale/ru/LC_MESSAGES/statusnet.po
locale/statusnet.po
locale/sv/LC_MESSAGES/statusnet.po
locale/te/LC_MESSAGES/statusnet.po
locale/tr/LC_MESSAGES/statusnet.po
locale/uk/LC_MESSAGES/statusnet.po
locale/vi/LC_MESSAGES/statusnet.po
locale/zh_CN/LC_MESSAGES/statusnet.po
locale/zh_TW/LC_MESSAGES/statusnet.po
plugins/Realtime/realtimeupdate.js
Diffstat (limited to 'locale/vi/LC_MESSAGES')
-rw-r--r-- | locale/vi/LC_MESSAGES/statusnet.po | 92 |
1 files changed, 40 insertions, 52 deletions
diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po index e3b2ac65a..b77e2e8fc 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: 2009-11-27 23:50+0000\n" -"PO-Revision-Date: 2009-11-28 19:51:06+0000\n" +"POT-Creation-Date: 2009-12-02 23:18+0000\n" +"PO-Revision-Date: 2009-12-02 23:21:00+0000\n" "Language-Team: Vietnamese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r59523); Translate extension (2009-11-16)\n" +"X-Generator: MediaWiki 1.16alpha(r59683); Translate extension (2009-11-29)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: vi\n" "X-Message-Group: out-statusnet\n" @@ -584,7 +584,7 @@ msgstr "Nhóm" #: actions/emailsettings.php:238 actions/favor.php:75 #: actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 +#: actions/invite.php:56 actions/login.php:129 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:187 actions/recoverpassword.php:337 @@ -760,7 +760,7 @@ msgid "Conversation" msgstr "Không có mã số xác nhận." #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:206 lib/searchgroupnav.php:82 +#: lib/profileaction.php:216 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Tin nhắn" @@ -1312,26 +1312,26 @@ msgstr "Người dùng đang lắng nghe để không thoát khỏi." msgid "You can use the local subscription!" msgstr "Bạn có thể đăng ký tại nơi bạn ở!" -#: actions/finishremotesubscribe.php:96 +#: actions/finishremotesubscribe.php:99 msgid "That user has blocked you from subscribing." msgstr "" -#: actions/finishremotesubscribe.php:106 +#: actions/finishremotesubscribe.php:110 #, fuzzy msgid "You are not authorized." msgstr "Chưa được phép." -#: actions/finishremotesubscribe.php:109 +#: actions/finishremotesubscribe.php:113 #, fuzzy msgid "Could not convert request token to access token." msgstr "Không thể chuyển các token yêu cầu đến token truy cập." -#: actions/finishremotesubscribe.php:114 +#: actions/finishremotesubscribe.php:118 #, fuzzy msgid "Remote service uses unknown version of OMB protocol." msgstr "Không biết phiên bản của giao thức OMB." -#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306 +#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 msgid "Error updating remote profile" msgstr "Lỗi xảy ra khi cập nhật hồ sơ cá nhân" @@ -1549,8 +1549,8 @@ msgid "" "action.newgroup%%) yourself!" msgstr "" -#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81 -#: lib/searchgroupnav.php:84 lib/subgroupnav.php:98 +#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 +#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 #, fuzzy msgid "Groups" msgstr "Nhóm" @@ -1887,53 +1887,53 @@ msgstr "%s và nhóm" msgid "Already logged in." msgstr "Đã đăng nhập." -#: actions/login.php:110 actions/login.php:120 +#: actions/login.php:108 actions/login.php:118 #, fuzzy msgid "Invalid or expired token." msgstr "Nội dung tin nhắn không hợp lệ" -#: actions/login.php:143 +#: actions/login.php:146 msgid "Incorrect username or password." msgstr "Sai tên đăng nhập hoặc mật khẩu." -#: actions/login.php:149 +#: actions/login.php:152 #, fuzzy msgid "Error setting user. You are probably not authorized." msgstr "Chưa được phép." -#: actions/login.php:204 actions/login.php:257 lib/action.php:458 +#: actions/login.php:207 actions/login.php:260 lib/action.php:458 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Đăng nhập" -#: actions/login.php:243 +#: actions/login.php:246 msgid "Login to site" msgstr "" -#: actions/login.php:246 actions/profilesettings.php:106 +#: actions/login.php:249 actions/profilesettings.php:106 #: actions/register.php:423 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:249 actions/register.php:428 +#: actions/login.php:252 actions/register.php:428 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Mật khẩu" -#: actions/login.php:252 actions/register.php:477 +#: actions/login.php:255 actions/register.php:477 msgid "Remember me" msgstr "Nhớ tôi" -#: actions/login.php:253 actions/register.php:479 +#: actions/login.php:256 actions/register.php:479 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:263 +#: actions/login.php:266 msgid "Lost or forgotten password?" msgstr "Mất hoặc quên mật khẩu?" -#: actions/login.php:282 +#: actions/login.php:285 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1941,7 +1941,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:286 +#: actions/login.php:289 #, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -2903,8 +2903,7 @@ msgstr "URL hồ sơ cá nhân không đúng định dạng." #: actions/remotesubscribe.php:168 #, fuzzy -msgid "" -"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)." +msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)." msgstr "Không phải là URL về hồ sơ cá nhân hợp lệ (không phải là " #: actions/remotesubscribe.php:176 @@ -3087,7 +3086,7 @@ msgid "Members" msgstr "Thành viên" #: actions/showgroup.php:386 lib/profileaction.php:117 -#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95 +#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 #: lib/tagcloudsection.php:71 msgid "(None)" msgstr "" @@ -3097,7 +3096,7 @@ msgstr "" msgid "All members" msgstr "Thành viên" -#: actions/showgroup.php:429 lib/profileaction.php:173 +#: actions/showgroup.php:429 lib/profileaction.php:174 msgid "Statistics" msgstr "Số liệu thống kê" @@ -4551,47 +4550,37 @@ msgstr "Không có mã số xác nhận." msgid "Can't turn on notification." msgstr "" -#: lib/command.php:597 -#, fuzzy, php-format -msgid "Could not create login token for %s" -msgstr "Không thể tạo OpenID mẫu: %s" - -#: lib/command.php:602 -#, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s" -msgstr "" - -#: lib/command.php:618 +#: lib/command.php:592 #, 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:620 +#: lib/command.php:594 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:640 +#: lib/command.php:614 #, fuzzy msgid "No one is subscribed to you." msgstr "Không thể tạo favorite." -#: lib/command.php:642 +#: lib/command.php:616 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:662 +#: lib/command.php:636 #, 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:664 +#: lib/command.php:638 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:678 +#: lib/command.php:652 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4610,7 +4599,6 @@ msgid "" "reply #<notice_id> - reply to notice with a given id\n" "reply <nickname> - reply to the last notice from user\n" "join <group> - join group\n" -"login - Get a link to login to the web interface\n" "drop <group> - leave group\n" "stats - get your stats\n" "stop - same as 'off'\n" @@ -4868,7 +4856,7 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:192 +#: lib/jabber.php:191 #, php-format msgid "[%s]" msgstr "" @@ -5337,7 +5325,7 @@ msgstr "Thư bạn đã gửi" msgid "Tags in %s's notices" msgstr "cảnh báo tin nhắn" -#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Tôi theo bạn này" @@ -5345,7 +5333,7 @@ msgstr "Tôi theo bạn này" msgid "All subscriptions" msgstr "Tất cả đăng nhận" -#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90 +#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Bạn này theo tôi" @@ -5354,15 +5342,15 @@ msgstr "Bạn này theo tôi" msgid "All subscribers" msgstr "Bạn này theo tôi" -#: lib/profileaction.php:177 +#: lib/profileaction.php:178 msgid "User ID" msgstr "" -#: lib/profileaction.php:182 +#: lib/profileaction.php:183 msgid "Member since" msgstr "Gia nhập từ" -#: lib/profileaction.php:235 +#: lib/profileaction.php:245 #, fuzzy msgid "All groups" msgstr "Nhóm" |