Merge branch 'master' into 0.9.x

[quix0rs-gnu-social.git] / plugins / TwitterBridge / locale / zh_CN / LC_MESSAGES / TwitterBridge.po

diff --git a/plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po
index 7b694b2eb68e5a4c74d4b7ec5e85ad1c3bdd8037..51d528f2a4928fc30089892efa5251747f6cee96 100644 (file)
--- a/plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TwitterBridge to Simplified Chinese (‪中文(简体)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: PhiLiP
 # Author: ZhengYiFeng
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:50+0000\n"
-"PO-Revision-Date: 2011-01-22 15:01:47+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:10:27+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-15 11:02:42+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:14+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -30,11 +30,11 @@ msgstr ""
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
-#: twitter.php:407
+#: twitter.php:409
 msgid "Your Twitter bridge has been disabled."
 msgstr "你的 Twitter bridge 已被禁用。"
 
-#: twitter.php:411
+#: twitter.php:413
 #, php-format
 msgid ""
 "Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
@@ -230,66 +230,66 @@ msgstr "创建新帐户"
 msgid "Create a new user with this nickname."
 msgstr "以此昵称创建新帐户"
 
-#: twitterauthorization.php:386
+#: twitterauthorization.php:390
 msgid "New nickname"
 msgstr "新昵称"
 
-#: twitterauthorization.php:388
+#: twitterauthorization.php:392
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1 到 64 个小写字母或数字，不包含标点或空格"
 
-#: twitterauthorization.php:391
+#: twitterauthorization.php:404
 msgid "Create"
 msgstr "创建"
 
-#: twitterauthorization.php:396
+#: twitterauthorization.php:409
 msgid "Connect existing account"
 msgstr "关联现有账号"
 
-#: twitterauthorization.php:398
+#: twitterauthorization.php:411
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your Twitter account."
 msgstr "如果你已有帐号，请输入用户名和密码登录并将其与你的 Twitter 账号关联。"
 
-#: twitterauthorization.php:401
+#: twitterauthorization.php:414
 msgid "Existing nickname"
 msgstr "已存在的昵称"
 
-#: twitterauthorization.php:404
+#: twitterauthorization.php:417
 msgid "Password"
 msgstr "密码"
 
-#: twitterauthorization.php:407
+#: twitterauthorization.php:420
 msgid "Connect"
 msgstr "关联"
 
-#: twitterauthorization.php:427 twitterauthorization.php:436
+#: twitterauthorization.php:466 twitterauthorization.php:475
 msgid "Registration not allowed."
 msgstr "不允许注册。"
 
-#: twitterauthorization.php:443
+#: twitterauthorization.php:482
 msgid "Not a valid invitation code."
 msgstr "无效的邀请码。"
 
-#: twitterauthorization.php:456
+#: twitterauthorization.php:495
 msgid "Nickname not allowed."
 msgstr "昵称不被允许。"
 
-#: twitterauthorization.php:461
+#: twitterauthorization.php:500
 msgid "Nickname already in use. Try another one."
 msgstr "昵称已被使用，换一个吧。"
 
-#: twitterauthorization.php:476
+#: twitterauthorization.php:520
 msgid "Error registering user."
 msgstr "注册用户出错。"
 
-#: twitterauthorization.php:487 twitterauthorization.php:527
-#: twitterauthorization.php:547
+#: twitterauthorization.php:531 twitterauthorization.php:571
+#: twitterauthorization.php:591
 msgid "Error connecting user to Twitter."
 msgstr "关联用户到 Twitter 出错。"
 
-#: twitterauthorization.php:509
+#: twitterauthorization.php:553
 msgid "Invalid username or password."
 msgstr "用户名或密码不正确。"