diff options
author | Brion Vibber <brion@pobox.com> | 2010-12-16 15:56:19 -0800 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-12-16 15:56:19 -0800 |
commit | e79034e163967a375aee8a9afff54fd9c37030dd (patch) | |
tree | daa48934b25ea7e4f399d59981c9534e7e43fbcc /plugins/Facebook/locale/zh_CN | |
parent | bf20258f4b61dd8396db9a1980463c060dab292c (diff) | |
parent | f901c25012f6c83f70c83bff9e76edb4d01b8373 (diff) |
Merge branch '0.9.x' into 1.0.x
Conflicts:
plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
Diffstat (limited to 'plugins/Facebook/locale/zh_CN')
-rw-r--r-- | plugins/Facebook/locale/zh_CN/LC_MESSAGES/Facebook.po | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/plugins/Facebook/locale/zh_CN/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/zh_CN/LC_MESSAGES/Facebook.po index 5a4ad5ca0..1f3be132b 100644 --- a/plugins/Facebook/locale/zh_CN/LC_MESSAGES/Facebook.po +++ b/plugins/Facebook/locale/zh_CN/LC_MESSAGES/Facebook.po @@ -10,14 +10,14 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet - Facebook\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-11-30 20:16+0000\n" -"PO-Revision-Date: 2010-11-30 20:18:56+0000\n" +"POT-Creation-Date: 2010-12-16 15:08+0000\n" +"PO-Revision-Date: 2010-12-16 15:11:51+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-11-30 17:54:26+0000\n" -"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n" +"X-POT-Import-Date: 2010-11-30 20:40:34+0000\n" +"X-Generator: MediaWiki 1.18alpha (r78478); 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-facebook\n" @@ -553,6 +553,3 @@ msgstr "" #: facebooksettings.php:134 msgid "Sync preferences" msgstr "" - -#~ msgid "Nickname must have only lowercase letters and numbers and no spaces." -#~ msgstr "昵称只能使用小写字母和数字且不能使用空格。" |