diff options
| author | Brion Vibber <brion@pobox.com> | 2010-10-25 13:08:57 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-10-25 13:08:57 -0700 |
| commit | ca489631db840e33757a71a7e4cb56b187c182d3 (patch) | |
| tree | 92c71b81b6870a8fd2d9c94bed8571b653d95413 /plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po | |
| parent | 90c87553ee7566593529199374215ae80bb3e209 (diff) | |
| parent | 01637bcd32921d6857fb7f5c0bbd40fba6bdb830 (diff) | |
Merge branch '0.9.x' into 1.0.x
Conflicts:
actions/subscriptions.php
lib/router.php
lib/xmppmanager.php
lib/xmppoutqueuehandler.php
Diffstat (limited to 'plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po')
| -rw-r--r-- | plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po index 1d3bada15..323d16623 100644 --- a/plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po +++ b/plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po @@ -9,24 +9,24 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet - TwitterBridge\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-09 14:04+0000\n" -"PO-Revision-Date: 2010-10-09 14:08:33+0000\n" +"POT-Creation-Date: 2010-10-23 18:02+0000\n" +"PO-Revision-Date: 2010-10-23 18:06:10+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: 2010-10-03 20:57:34+0000\n" -"X-Generator: MediaWiki 1.17alpha (r74529); Translate extension (2010-09-17)\n" +"X-POT-Import-Date: 2010-10-18 20:34:15+0000\n" +"X-Generator: MediaWiki 1.17alpha (r75280); Translate extension (2010-09-17)\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" "Plural-Forms: nplurals=1; plural=0;\n" -#: twitter.php:350 +#: twitter.php:349 msgid "Your Twitter bridge has been disabled." msgstr "你的 Twitter bridge 已被禁用。" -#: twitter.php:354 +#: twitter.php:353 #, php-format msgid "" "Hi, %1$s. We're sorry to inform you that your link to Twitter has been " |