diff --git a/view/zh-cn/messages.po b/view/zh-cn/messages.po
index 8925d7276e..bbeab95007 100644
--- a/view/zh-cn/messages.po
+++ b/view/zh-cn/messages.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
-"POT-Creation-Date: 2013-01-12 10:00-0800\n"
-"PO-Revision-Date: 2013-01-13 08:58+0000\n"
+"POT-Creation-Date: 2013-01-15 10:00-0800\n"
+"PO-Revision-Date: 2013-01-16 08:18+0000\n"
 "Last-Translator: matthew_exon <transifex.mexon@spamgourmet.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/friendica/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -55,15 +55,15 @@ msgstr "熟人更新失败。"
 #: ../../mod/message.php:38 ../../mod/message.php:172
 #: ../../mod/allfriends.php:9 ../../mod/nogroup.php:25
 #: ../../mod/wall_upload.php:66 ../../mod/follow.php:9
-#: ../../mod/display.php:173 ../../mod/profiles.php:9
-#: ../../mod/profiles.php:148 ../../mod/delegate.php:6
+#: ../../mod/display.php:180 ../../mod/profiles.php:146
+#: ../../mod/profiles.php:567 ../../mod/delegate.php:6
 #: ../../mod/suggest.php:28 ../../mod/invite.php:15 ../../mod/invite.php:83
 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:512
 #: ../../addon/facebook/facebook.php:518 ../../addon/fbpost/fbpost.php:170
 #: ../../addon/fbpost/fbpost.php:176
 #: ../../addon/dav/friendica/layout.fnk.php:354
 #: ../../addon/tumblr/tumblr.php:34 ../../include/items.php:3987
-#: ../../index.php:333 ../../addon.old/facebook/facebook.php:510
+#: ../../index.php:340 ../../addon.old/facebook/facebook.php:510
 #: ../../addon.old/facebook/facebook.php:516
 #: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165
 #: ../../addon.old/dav/friendica/layout.fnk.php:354
@@ -144,7 +144,7 @@ msgstr "新照片从这个URL"
 #: ../../mod/settings.php:1018 ../../mod/group.php:87 ../../mod/mood.php:137
 #: ../../mod/message.php:301 ../../mod/message.php:527 ../../mod/admin.php:461
 #: ../../mod/admin.php:728 ../../mod/admin.php:865 ../../mod/admin.php:1064
-#: ../../mod/admin.php:1151 ../../mod/profiles.php:623
+#: ../../mod/admin.php:1151 ../../mod/profiles.php:626
 #: ../../mod/invite.php:121 ../../addon/fromgplus/fromgplus.php:44
 #: ../../addon/facebook/facebook.php:621
 #: ../../addon/snautofollow/snautofollow.php:64
@@ -186,7 +186,7 @@ msgstr "新照片从这个URL"
 #: ../../view/theme/diabook/theme.php:642
 #: ../../view/theme/diabook/config.php:152
 #: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70
-#: ../../object/Item.php:609 ../../addon.old/fromgplus/fromgplus.php:40
+#: ../../object/Item.php:604 ../../addon.old/fromgplus/fromgplus.php:40
 #: ../../addon.old/facebook/facebook.php:619
 #: ../../addon.old/snautofollow/snautofollow.php:64
 #: ../../addon.old/bg/bg.php:90 ../../addon.old/fbpost/fbpost.php:226
@@ -244,11 +244,11 @@ msgstr "帮助："
 msgid "Help"
 msgstr "帮助"
 
-#: ../../mod/help.php:90 ../../index.php:218
+#: ../../mod/help.php:90 ../../index.php:225
 msgid "Not Found"
 msgstr "未发现"
 
-#: ../../mod/help.php:93 ../../index.php:221
+#: ../../mod/help.php:93 ../../index.php:228
 msgid "Page not found."
 msgstr "页发现。"
 
@@ -291,7 +291,7 @@ msgid "link to source"
 msgstr "链接到来源"
 
 #: ../../mod/events.php:358 ../../view/theme/diabook/theme.php:91
-#: ../../include/nav.php:52 ../../boot.php:1829
+#: ../../include/nav.php:52 ../../boot.php:1836
 msgid "Events"
 msgstr "事件"
 
@@ -350,7 +350,7 @@ msgstr "描述："
 #: ../../mod/events.php:459 ../../mod/directory.php:134
 #: ../../addon/forumdirectory/forumdirectory.php:156
 #: ../../include/event.php:40 ../../include/bb2diaspora.php:415
-#: ../../boot.php:1350
+#: ../../boot.php:1358
 msgid "Location:"
 msgstr "位置:"
 
@@ -362,11 +362,15 @@ msgstr ""
 msgid "Share this event"
 msgstr "分享这个项目"
 
+#: ../../mod/maintenance.php:5
+msgid "System down for maintenance"
+msgstr ""
+
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:145
 #: ../../mod/dfrn_request.php:848 ../../mod/settings.php:561
 #: ../../mod/settings.php:587 ../../mod/fbrowser.php:81
 #: ../../mod/fbrowser.php:116 ../../addon/js_upload/js_upload.php:45
-#: ../../include/conversation.php:1045
+#: ../../include/conversation.php:1040
 #: ../../addon.old/js_upload/js_upload.php:45
 msgid "Cancel"
 msgstr "退消"
@@ -420,7 +424,7 @@ msgstr "您想不想使这个应用用权您的文章和熟人，和／或代您
 #: ../../mod/settings.php:1005 ../../mod/settings.php:1006
 #: ../../mod/settings.php:1007 ../../mod/settings.php:1008
 #: ../../mod/settings.php:1009 ../../mod/register.php:239
-#: ../../mod/profiles.php:603
+#: ../../mod/profiles.php:606
 msgid "Yes"
 msgstr "是"
 
@@ -432,11 +436,11 @@ msgstr "是"
 #: ../../mod/settings.php:1005 ../../mod/settings.php:1006
 #: ../../mod/settings.php:1007 ../../mod/settings.php:1008
 #: ../../mod/settings.php:1009 ../../mod/register.php:240
-#: ../../mod/profiles.php:604
+#: ../../mod/profiles.php:607
 msgid "No"
 msgstr "否"
 
-#: ../../mod/photos.php:51 ../../boot.php:1822
+#: ../../mod/photos.php:51 ../../boot.php:1829
 msgid "Photo Albums"
 msgstr "相册"
 
@@ -515,7 +519,7 @@ msgstr "图像上载失败了."
 
 #: ../../mod/photos.php:865 ../../mod/community.php:18
 #: ../../mod/dfrn_request.php:761 ../../mod/viewcontacts.php:17
-#: ../../mod/display.php:7 ../../mod/search.php:89 ../../mod/directory.php:31
+#: ../../mod/display.php:19 ../../mod/search.php:89 ../../mod/directory.php:31
 #: ../../addon/forumdirectory/forumdirectory.php:53
 msgid "Public access denied."
 msgstr "公众看拒绝"
@@ -590,7 +594,7 @@ msgid "Use as profile photo"
 msgstr "用为资料图"
 
 #: ../../mod/photos.php:1270 ../../mod/content.php:620
-#: ../../object/Item.php:105
+#: ../../object/Item.php:106
 msgid "Private Message"
 msgstr "私人的新闻"
 
@@ -632,16 +636,16 @@ msgid ""
 msgstr "例子：@zhang, @Zhang_San, @li@example.com, #Beijing, #ktv"
 
 #: ../../mod/photos.php:1420 ../../mod/content.php:684
-#: ../../object/Item.php:203
+#: ../../object/Item.php:204
 msgid "I like this (toggle)"
 msgstr "我喜欢这(交替)"
 
 #: ../../mod/photos.php:1421 ../../mod/content.php:685
-#: ../../object/Item.php:204
+#: ../../object/Item.php:205
 msgid "I don't like this (toggle)"
 msgstr "我不喜欢这(交替)"
 
-#: ../../mod/photos.php:1422 ../../include/conversation.php:1005
+#: ../../mod/photos.php:1422 ../../include/conversation.php:1000
 msgid "Share"
 msgstr "分享"
 
@@ -649,33 +653,33 @@ msgstr "分享"
 #: ../../mod/content.php:499 ../../mod/content.php:883
 #: ../../mod/wallmessage.php:152 ../../mod/message.php:300
 #: ../../mod/message.php:528 ../../include/conversation.php:645
-#: ../../include/conversation.php:1024 ../../object/Item.php:292
+#: ../../include/conversation.php:1019 ../../object/Item.php:293
 msgid "Please wait"
 msgstr "请等一下"
 
 #: ../../mod/photos.php:1439 ../../mod/photos.php:1483
 #: ../../mod/photos.php:1566 ../../mod/content.php:707
-#: ../../object/Item.php:606
+#: ../../object/Item.php:601
 msgid "This is you"
 msgstr "这是你"
 
 #: ../../mod/photos.php:1441 ../../mod/photos.php:1485
 #: ../../mod/photos.php:1568 ../../mod/content.php:709 ../../boot.php:641
-#: ../../object/Item.php:289 ../../object/Item.php:608
+#: ../../object/Item.php:290 ../../object/Item.php:603
 msgid "Comment"
 msgstr "评论"
 
 #: ../../mod/photos.php:1443 ../../mod/photos.php:1487
 #: ../../mod/photos.php:1570 ../../mod/editpost.php:142
-#: ../../mod/content.php:719 ../../include/conversation.php:1042
-#: ../../object/Item.php:618
+#: ../../mod/content.php:719 ../../include/conversation.php:1037
+#: ../../object/Item.php:613
 msgid "Preview"
 msgstr "预演"
 
 #: ../../mod/photos.php:1527 ../../mod/content.php:439
 #: ../../mod/content.php:741 ../../mod/settings.php:623
 #: ../../mod/group.php:171 ../../mod/admin.php:735
-#: ../../include/conversation.php:569 ../../object/Item.php:119
+#: ../../include/conversation.php:569 ../../object/Item.php:120
 msgid "Delete"
 msgstr "删除"
 
@@ -741,96 +745,96 @@ msgstr "项目没找到"
 msgid "Edit post"
 msgstr "编辑文章"
 
-#: ../../mod/editpost.php:91 ../../include/conversation.php:991
+#: ../../mod/editpost.php:91 ../../include/conversation.php:986
 msgid "Post to Email"
 msgstr "电邮发布"
 
 #: ../../mod/editpost.php:106 ../../mod/content.php:728
-#: ../../mod/settings.php:622 ../../object/Item.php:109
+#: ../../mod/settings.php:622 ../../object/Item.php:110
 msgid "Edit"
 msgstr "编辑"
 
 #: ../../mod/editpost.php:107 ../../mod/wallmessage.php:150
 #: ../../mod/message.php:298 ../../mod/message.php:525
-#: ../../include/conversation.php:1006
+#: ../../include/conversation.php:1001
 msgid "Upload photo"
 msgstr "上传照片"
 
-#: ../../mod/editpost.php:108 ../../include/conversation.php:1007
+#: ../../mod/editpost.php:108 ../../include/conversation.php:1002
 msgid "upload photo"
 msgstr "上传照片"
 
-#: ../../mod/editpost.php:109 ../../include/conversation.php:1008
+#: ../../mod/editpost.php:109 ../../include/conversation.php:1003
 msgid "Attach file"
 msgstr "附上文件"
 
-#: ../../mod/editpost.php:110 ../../include/conversation.php:1009
+#: ../../mod/editpost.php:110 ../../include/conversation.php:1004
 msgid "attach file"
 msgstr "附上文件"
 
 #: ../../mod/editpost.php:111 ../../mod/wallmessage.php:151
 #: ../../mod/message.php:299 ../../mod/message.php:526
-#: ../../include/conversation.php:1010
+#: ../../include/conversation.php:1005
 msgid "Insert web link"
 msgstr "插入网页环节"
 
-#: ../../mod/editpost.php:112 ../../include/conversation.php:1011
+#: ../../mod/editpost.php:112 ../../include/conversation.php:1006
 msgid "web link"
 msgstr "网页环节"
 
-#: ../../mod/editpost.php:113 ../../include/conversation.php:1012
+#: ../../mod/editpost.php:113 ../../include/conversation.php:1007
 msgid "Insert video link"
 msgstr "插入视频环节"
 
-#: ../../mod/editpost.php:114 ../../include/conversation.php:1013
+#: ../../mod/editpost.php:114 ../../include/conversation.php:1008
 msgid "video link"
 msgstr "视频环节"
 
-#: ../../mod/editpost.php:115 ../../include/conversation.php:1014
+#: ../../mod/editpost.php:115 ../../include/conversation.php:1009
 msgid "Insert audio link"
 msgstr "插入录音环节"
 
-#: ../../mod/editpost.php:116 ../../include/conversation.php:1015
+#: ../../mod/editpost.php:116 ../../include/conversation.php:1010
 msgid "audio link"
 msgstr "录音环节"
 
-#: ../../mod/editpost.php:117 ../../include/conversation.php:1016
+#: ../../mod/editpost.php:117 ../../include/conversation.php:1011
 msgid "Set your location"
 msgstr "设定您的位置"
 
-#: ../../mod/editpost.php:118 ../../include/conversation.php:1017
+#: ../../mod/editpost.php:118 ../../include/conversation.php:1012
 msgid "set location"
 msgstr "指定位置"
 
-#: ../../mod/editpost.php:119 ../../include/conversation.php:1018
+#: ../../mod/editpost.php:119 ../../include/conversation.php:1013
 msgid "Clear browser location"
 msgstr "清空浏览器位置"
 
-#: ../../mod/editpost.php:120 ../../include/conversation.php:1019
+#: ../../mod/editpost.php:120 ../../include/conversation.php:1014
 msgid "clear location"
 msgstr "清理出位置"
 
-#: ../../mod/editpost.php:122 ../../include/conversation.php:1025
+#: ../../mod/editpost.php:122 ../../include/conversation.php:1020
 msgid "Permission settings"
 msgstr "权设置"
 
-#: ../../mod/editpost.php:130 ../../include/conversation.php:1034
+#: ../../mod/editpost.php:130 ../../include/conversation.php:1029
 msgid "CC: email addresses"
 msgstr "抄送: 电子邮件地址"
 
-#: ../../mod/editpost.php:131 ../../include/conversation.php:1035
+#: ../../mod/editpost.php:131 ../../include/conversation.php:1030
 msgid "Public post"
 msgstr "公开的消息"
 
-#: ../../mod/editpost.php:134 ../../include/conversation.php:1021
+#: ../../mod/editpost.php:134 ../../include/conversation.php:1016
 msgid "Set title"
 msgstr "指定标题"
 
-#: ../../mod/editpost.php:136 ../../include/conversation.php:1023
+#: ../../mod/editpost.php:136 ../../include/conversation.php:1018
 msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: ../../mod/editpost.php:137 ../../include/conversation.php:1037
+#: ../../mod/editpost.php:137 ../../include/conversation.php:1032
 msgid "Example: bob@example.com, mary@example.com"
 msgstr "比如: li@example.com, wang@example.com"
 
@@ -1431,7 +1435,7 @@ msgid "is interested in:"
 msgstr "感兴趣对："
 
 #: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:1288
+#: ../../include/contact_widgets.php:9 ../../boot.php:1296
 msgid "Connect"
 msgstr "连接"
 
@@ -1461,19 +1465,19 @@ msgid "Group: "
 msgstr "组："
 
 #: ../../mod/content.php:438 ../../mod/content.php:740
-#: ../../include/conversation.php:568 ../../object/Item.php:118
+#: ../../include/conversation.php:568 ../../object/Item.php:119
 msgid "Select"
 msgstr "选择"
 
 #: ../../mod/content.php:472 ../../mod/content.php:852
 #: ../../mod/content.php:853 ../../include/conversation.php:608
-#: ../../object/Item.php:257 ../../object/Item.php:258
+#: ../../object/Item.php:258 ../../object/Item.php:259
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr "看%s的简介@ %s"
 
 #: ../../mod/content.php:482 ../../mod/content.php:864
-#: ../../include/conversation.php:628 ../../object/Item.php:271
+#: ../../include/conversation.php:628 ../../object/Item.php:272
 #, php-format
 msgid "%s from %s"
 msgstr "%s从%s"
@@ -1482,14 +1486,14 @@ msgstr "%s从%s"
 msgid "View in context"
 msgstr "看在上下文"
 
-#: ../../mod/content.php:603 ../../object/Item.php:312
+#: ../../mod/content.php:603 ../../object/Item.php:313
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] "%d评论"
 
 #: ../../mod/content.php:605 ../../include/text.php:1502
-#: ../../object/Item.php:314 ../../object/Item.php:327
+#: ../../object/Item.php:315 ../../object/Item.php:328
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] ""
@@ -1497,92 +1501,92 @@ msgstr[0] ""
 #: ../../mod/content.php:606 ../../addon/page/page.php:77
 #: ../../addon/page/page.php:111 ../../addon/showmore/showmore.php:119
 #: ../../include/contact_widgets.php:204 ../../boot.php:642
-#: ../../object/Item.php:315 ../../addon.old/page/page.php:77
+#: ../../object/Item.php:316 ../../addon.old/page/page.php:77
 #: ../../addon.old/page/page.php:111 ../../addon.old/showmore/showmore.php:119
 msgid "show more"
 msgstr "看多"
 
-#: ../../mod/content.php:684 ../../object/Item.php:203
+#: ../../mod/content.php:684 ../../object/Item.php:204
 msgid "like"
 msgstr "喜欢"
 
-#: ../../mod/content.php:685 ../../object/Item.php:204
+#: ../../mod/content.php:685 ../../object/Item.php:205
 msgid "dislike"
 msgstr "讨厌"
 
-#: ../../mod/content.php:687 ../../object/Item.php:206
+#: ../../mod/content.php:687 ../../object/Item.php:207
 msgid "Share this"
 msgstr "分享这个"
 
-#: ../../mod/content.php:687 ../../object/Item.php:206
+#: ../../mod/content.php:687 ../../object/Item.php:207
 msgid "share"
 msgstr "分享"
 
-#: ../../mod/content.php:711 ../../object/Item.php:610
+#: ../../mod/content.php:711 ../../object/Item.php:605
 msgid "Bold"
 msgstr ""
 
-#: ../../mod/content.php:712 ../../object/Item.php:611
+#: ../../mod/content.php:712 ../../object/Item.php:606
 msgid "Italic"
 msgstr ""
 
-#: ../../mod/content.php:713 ../../object/Item.php:612
+#: ../../mod/content.php:713 ../../object/Item.php:607
 msgid "Underline"
 msgstr ""
 
-#: ../../mod/content.php:714 ../../object/Item.php:613
+#: ../../mod/content.php:714 ../../object/Item.php:608
 msgid "Quote"
 msgstr ""
 
-#: ../../mod/content.php:715 ../../object/Item.php:614
+#: ../../mod/content.php:715 ../../object/Item.php:609
 msgid "Code"
 msgstr ""
 
-#: ../../mod/content.php:716 ../../object/Item.php:615
+#: ../../mod/content.php:716 ../../object/Item.php:610
 msgid "Image"
 msgstr ""
 
-#: ../../mod/content.php:717 ../../object/Item.php:616
+#: ../../mod/content.php:717 ../../object/Item.php:611
 msgid "Link"
 msgstr ""
 
-#: ../../mod/content.php:718 ../../object/Item.php:617
+#: ../../mod/content.php:718 ../../object/Item.php:612
 msgid "Video"
 msgstr ""
 
-#: ../../mod/content.php:753 ../../object/Item.php:182
+#: ../../mod/content.php:753 ../../object/Item.php:183
 msgid "add star"
 msgstr "加星"
 
-#: ../../mod/content.php:754 ../../object/Item.php:183
+#: ../../mod/content.php:754 ../../object/Item.php:184
 msgid "remove star"
 msgstr "消星"
 
-#: ../../mod/content.php:755 ../../object/Item.php:184
+#: ../../mod/content.php:755 ../../object/Item.php:185
 msgid "toggle star status"
 msgstr "转变星现状"
 
-#: ../../mod/content.php:758 ../../object/Item.php:187
+#: ../../mod/content.php:758 ../../object/Item.php:188
 msgid "starred"
 msgstr "被贴星"
 
-#: ../../mod/content.php:759 ../../object/Item.php:192
+#: ../../mod/content.php:759 ../../object/Item.php:193
 msgid "add tag"
 msgstr "加标签"
 
-#: ../../mod/content.php:763 ../../object/Item.php:122
+#: ../../mod/content.php:763 ../../object/Item.php:123
 msgid "save to folder"
 msgstr ""
 
-#: ../../mod/content.php:854 ../../object/Item.php:259
+#: ../../mod/content.php:854 ../../object/Item.php:260
 msgid "to"
 msgstr "至"
 
-#: ../../mod/content.php:855 ../../object/Item.php:261
+#: ../../mod/content.php:855 ../../object/Item.php:262
 msgid "Wall-to-Wall"
 msgstr "从墙到墙"
 
-#: ../../mod/content.php:856 ../../object/Item.php:262
+#: ../../mod/content.php:856 ../../object/Item.php:263
 msgid "via Wall-To-Wall:"
 msgstr "通过从墙到墙"
 
@@ -2102,7 +2106,7 @@ msgid ""
 "Password reset failed."
 msgstr "要求确认不了。(您可能已经提交它。)重设密码失败了。"
 
-#: ../../mod/lostpass.php:84 ../../boot.php:1022
+#: ../../mod/lostpass.php:84 ../../boot.php:1030
 msgid "Password Reset"
 msgstr "复位密码"
 
@@ -2782,7 +2786,7 @@ msgstr "私人通信给这个人回被公开。"
 msgid "Invalid contact."
 msgstr "无效熟人。"
 
-#: ../../mod/notes.php:44 ../../boot.php:1836
+#: ../../mod/notes.php:44 ../../boot.php:1843
 msgid "Personal Notes"
 msgstr "私人便条"
 
@@ -2873,7 +2877,7 @@ msgstr ""
 #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131
 #: ../../mod/message.php:249 ../../mod/message.php:257
 #: ../../mod/message.php:429 ../../mod/message.php:437
-#: ../../include/conversation.php:941 ../../include/conversation.php:959
+#: ../../include/conversation.php:936 ../../include/conversation.php:954
 msgid "Please enter a link URL:"
 msgstr "请输入环节URL："
 
@@ -2956,7 +2960,7 @@ msgstr "校对别的设置，特别隐私设置。一个未出版的目录项目
 #: ../../mod/newmember.php:32 ../../mod/profperm.php:103
 #: ../../view/theme/diabook/theme.php:88 ../../include/profile_advanced.php:7
 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50
-#: ../../boot.php:1812
+#: ../../boot.php:1819
 msgid "Profile"
 msgstr "简介"
 
@@ -3127,7 +3131,7 @@ msgstr "组找不到。"
 msgid "Group name changed."
 msgstr "组名变化了。"
 
-#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:332
+#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:339
 msgid "Permission denied"
 msgstr "权限不够"
 
@@ -3155,7 +3159,7 @@ msgstr "组编辑器"
 msgid "Members"
 msgstr "成员"
 
-#: ../../mod/group.php:223 ../../mod/profperm.php:105
+#: ../../mod/group.php:224 ../../mod/profperm.php:105
 msgid "Click on a contact to add or remove."
 msgstr "点击熟人为添加或删除。"
 
@@ -3261,7 +3265,7 @@ msgstr "选择简介昵称。昵称头一字必须拉丁字。您再这个网站
 msgid "Choose a nickname: "
 msgstr "选择昵称："
 
-#: ../../mod/register.php:275 ../../include/nav.php:81 ../../boot.php:983
+#: ../../mod/register.php:275 ../../include/nav.php:81 ../../boot.php:991
 msgid "Register"
 msgstr "注册"
 
@@ -3272,7 +3276,7 @@ msgstr "搜索人物"
 #: ../../mod/like.php:145 ../../mod/subthread.php:87 ../../mod/tagger.php:62
 #: ../../addon/communityhome/communityhome.php:171
 #: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1498
-#: ../../include/diaspora.php:1851 ../../include/conversation.php:125
+#: ../../include/diaspora.php:1860 ../../include/conversation.php:125
 #: ../../include/conversation.php:253
 #: ../../addon.old/communityhome/communityhome.php:163
 msgid "photo"
@@ -3283,7 +3287,7 @@ msgstr "照片"
 #: ../../addon/communityhome/communityhome.php:166
 #: ../../addon/communityhome/communityhome.php:175
 #: ../../view/theme/diabook/theme.php:459
-#: ../../view/theme/diabook/theme.php:468 ../../include/diaspora.php:1851
+#: ../../view/theme/diabook/theme.php:468 ../../include/diaspora.php:1860
 #: ../../include/conversation.php:120 ../../include/conversation.php:129
 #: ../../include/conversation.php:248 ../../include/conversation.php:257
 #: ../../addon.old/facebook/facebook.php:1598
@@ -3294,7 +3298,7 @@ msgstr "现状"
 
 #: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1604
 #: ../../addon/communityhome/communityhome.php:180
-#: ../../view/theme/diabook/theme.php:473 ../../include/diaspora.php:1867
+#: ../../view/theme/diabook/theme.php:473 ../../include/diaspora.php:1876
 #: ../../include/conversation.php:136
 #: ../../addon.old/facebook/facebook.php:1602
 #: ../../addon.old/communityhome/communityhome.php:172
@@ -3308,8 +3312,8 @@ msgid "%1$s doesn't like %2$s's %3$s"
 msgstr "%1$s不喜欢%2$s的%3$s"
 
 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
-#: ../../mod/admin.php:773 ../../mod/admin.php:972 ../../mod/display.php:47
-#: ../../mod/display.php:177 ../../include/items.php:3853
+#: ../../mod/admin.php:773 ../../mod/admin.php:972 ../../mod/display.php:51
+#: ../../mod/display.php:184 ../../include/items.php:3853
 msgid "Item not found."
 msgstr "项目找不到。"
 
@@ -3318,7 +3322,7 @@ msgid "Access denied."
 msgstr "没有用权。"
 
 #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90
-#: ../../include/nav.php:51 ../../boot.php:1819
+#: ../../include/nav.php:51 ../../boot.php:1826
 msgid "Photos"
 msgstr "照片"
 
@@ -4253,11 +4257,11 @@ msgstr "FTP用户"
 msgid "FTP Password"
 msgstr "FTP密码"
 
-#: ../../mod/profile.php:21 ../../boot.php:1196
+#: ../../mod/profile.php:21 ../../boot.php:1204
 msgid "Requested profile is not available."
 msgstr "要求的简介联系不上的。"
 
-#: ../../mod/profile.php:155 ../../mod/display.php:95
+#: ../../mod/profile.php:155 ../../mod/display.php:99
 msgid "Access to this profile has been restricted."
 msgstr "使用权这个简介被限制了."
 
@@ -4349,7 +4353,7 @@ msgstr ""
 msgid "link"
 msgstr ""
 
-#: ../../mod/display.php:170
+#: ../../mod/display.php:177
 msgid "Item has been removed."
 msgstr "项目被删除了。"
 
@@ -4366,322 +4370,322 @@ msgstr "没有安装的应用"
 msgid "Search"
 msgstr "搜索"
 
-#: ../../mod/profiles.php:20 ../../mod/profiles.php:135
-#: ../../mod/profiles.php:162 ../../mod/profiles.php:576
+#: ../../mod/profiles.php:18 ../../mod/profiles.php:133
+#: ../../mod/profiles.php:160 ../../mod/profiles.php:579
 #: ../../mod/dfrn_confirm.php:62
 msgid "Profile not found."
 msgstr "找不到简介。"
 
-#: ../../mod/profiles.php:39
+#: ../../mod/profiles.php:37
 msgid "Profile deleted."
 msgstr "简介删除了。"
 
-#: ../../mod/profiles.php:57 ../../mod/profiles.php:91
+#: ../../mod/profiles.php:55 ../../mod/profiles.php:89
 msgid "Profile-"
 msgstr "简介-"
 
-#: ../../mod/profiles.php:76 ../../mod/profiles.php:119
+#: ../../mod/profiles.php:74 ../../mod/profiles.php:117
 msgid "New profile created."
 msgstr "创造新的简介"
 
-#: ../../mod/profiles.php:97
+#: ../../mod/profiles.php:95
 msgid "Profile unavailable to clone."
 msgstr "简介不可用为复制。"
 
-#: ../../mod/profiles.php:172
+#: ../../mod/profiles.php:170
 msgid "Profile Name is required."
 msgstr "必要简介名"
 
-#: ../../mod/profiles.php:319
+#: ../../mod/profiles.php:317
 msgid "Marital Status"
 msgstr ""
 
-#: ../../mod/profiles.php:323
+#: ../../mod/profiles.php:321
 msgid "Romantic Partner"
 msgstr ""
 
-#: ../../mod/profiles.php:327
+#: ../../mod/profiles.php:325
 msgid "Likes"
 msgstr ""
 
-#: ../../mod/profiles.php:331
+#: ../../mod/profiles.php:329
 msgid "Dislikes"
 msgstr ""
 
-#: ../../mod/profiles.php:335
+#: ../../mod/profiles.php:333
 msgid "Work/Employment"
 msgstr ""
 
-#: ../../mod/profiles.php:338
+#: ../../mod/profiles.php:336
 msgid "Religion"
 msgstr ""
 
-#: ../../mod/profiles.php:342
+#: ../../mod/profiles.php:340
 msgid "Political Views"
 msgstr ""
 
-#: ../../mod/profiles.php:346
+#: ../../mod/profiles.php:344
 msgid "Gender"
 msgstr ""
 
-#: ../../mod/profiles.php:350
+#: ../../mod/profiles.php:348
 msgid "Sexual Preference"
 msgstr ""
 
-#: ../../mod/profiles.php:354
+#: ../../mod/profiles.php:352
 msgid "Homepage"
 msgstr ""
 
-#: ../../mod/profiles.php:358
+#: ../../mod/profiles.php:356
 msgid "Interests"
 msgstr ""
 
-#: ../../mod/profiles.php:362
+#: ../../mod/profiles.php:360
 msgid "Address"
 msgstr ""
 
-#: ../../mod/profiles.php:369 ../../addon/dav/common/wdcal_edit.inc.php:183
+#: ../../mod/profiles.php:367 ../../addon/dav/common/wdcal_edit.inc.php:183
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:183
 msgid "Location"
 msgstr ""
 
-#: ../../mod/profiles.php:452
+#: ../../mod/profiles.php:450
 msgid "Profile updated."
 msgstr "简介更新了。"
 
-#: ../../mod/profiles.php:519
+#: ../../mod/profiles.php:517
 msgid " and "
 msgstr ""
 
-#: ../../mod/profiles.php:527
+#: ../../mod/profiles.php:525
 msgid "public profile"
 msgstr ""
 
-#: ../../mod/profiles.php:530
+#: ../../mod/profiles.php:528
 #, php-format
 msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
 msgstr ""
 
-#: ../../mod/profiles.php:531
+#: ../../mod/profiles.php:529
 #, php-format
 msgid " - Visit %1$s's %2$s"
 msgstr ""
 
-#: ../../mod/profiles.php:534
+#: ../../mod/profiles.php:532
 #, php-format
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr ""
 
-#: ../../mod/profiles.php:602
+#: ../../mod/profiles.php:605
 msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr "藏起来发现您的熟人／朋友单不让这个简介看着看？"
 
-#: ../../mod/profiles.php:622
+#: ../../mod/profiles.php:625
 msgid "Edit Profile Details"
 msgstr "剪辑简介消息"
 
-#: ../../mod/profiles.php:624
+#: ../../mod/profiles.php:627
 msgid "Change Profile Photo"
 msgstr ""
 
-#: ../../mod/profiles.php:625
+#: ../../mod/profiles.php:628
 msgid "View this profile"
 msgstr "看这个简介"
 
-#: ../../mod/profiles.php:626
+#: ../../mod/profiles.php:629
 msgid "Create a new profile using these settings"
 msgstr "造成新的简介用这些设置"
 
-#: ../../mod/profiles.php:627
+#: ../../mod/profiles.php:630
 msgid "Clone this profile"
 msgstr "复制这个简介"
 
-#: ../../mod/profiles.php:628
+#: ../../mod/profiles.php:631
 msgid "Delete this profile"
 msgstr "删除这个简介"
 
-#: ../../mod/profiles.php:629
+#: ../../mod/profiles.php:632
 msgid "Profile Name:"
 msgstr "简介名："
 
-#: ../../mod/profiles.php:630
+#: ../../mod/profiles.php:633
 msgid "Your Full Name:"
 msgstr "你的全名："
 
-#: ../../mod/profiles.php:631
+#: ../../mod/profiles.php:634
 msgid "Title/Description:"
 msgstr "标题／描述："
 
-#: ../../mod/profiles.php:632
+#: ../../mod/profiles.php:635
 msgid "Your Gender:"
 msgstr "你的性："
 
-#: ../../mod/profiles.php:633
+#: ../../mod/profiles.php:636
 #, php-format
 msgid "Birthday (%s):"
 msgstr "生日(%s):"
 
-#: ../../mod/profiles.php:634
+#: ../../mod/profiles.php:637
 msgid "Street Address:"
 msgstr "地址："
 
-#: ../../mod/profiles.php:635
+#: ../../mod/profiles.php:638
 msgid "Locality/City:"
 msgstr "现场／城市："
 
-#: ../../mod/profiles.php:636
+#: ../../mod/profiles.php:639
 msgid "Postal/Zip Code:"
 msgstr "邮政编码："
 
-#: ../../mod/profiles.php:637
+#: ../../mod/profiles.php:640
 msgid "Country:"
 msgstr "国家："
 
-#: ../../mod/profiles.php:638
+#: ../../mod/profiles.php:641
 msgid "Region/State:"
 msgstr "区域／省"
 
-#: ../../mod/profiles.php:639
+#: ../../mod/profiles.php:642
 msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr "<span class=\"heart\">&hearts;</span>婚姻状况："
 
-#: ../../mod/profiles.php:640
+#: ../../mod/profiles.php:643
 msgid "Who: (if applicable)"
 msgstr "谁：（要是使用）"
 
-#: ../../mod/profiles.php:641
+#: ../../mod/profiles.php:644
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr "比如：limou，李某，limou＠example。com"
 
-#: ../../mod/profiles.php:642
+#: ../../mod/profiles.php:645
 msgid "Since [date]:"
 msgstr ""
 
-#: ../../mod/profiles.php:643 ../../include/profile_advanced.php:46
+#: ../../mod/profiles.php:646 ../../include/profile_advanced.php:46
 msgid "Sexual Preference:"
 msgstr "性取向"
 
-#: ../../mod/profiles.php:644
+#: ../../mod/profiles.php:647
 msgid "Homepage URL:"
 msgstr "主页URL："
 
-#: ../../mod/profiles.php:645 ../../include/profile_advanced.php:50
+#: ../../mod/profiles.php:648 ../../include/profile_advanced.php:50
 msgid "Hometown:"
 msgstr ""
 
-#: ../../mod/profiles.php:646 ../../include/profile_advanced.php:54
+#: ../../mod/profiles.php:649 ../../include/profile_advanced.php:54
 msgid "Political Views:"
 msgstr "政治观念："
 
-#: ../../mod/profiles.php:647
+#: ../../mod/profiles.php:650
 msgid "Religious Views:"
 msgstr " 宗教信仰 ："
 
-#: ../../mod/profiles.php:648
+#: ../../mod/profiles.php:651
 msgid "Public Keywords:"
 msgstr "公开关键字 ："
 
-#: ../../mod/profiles.php:649
+#: ../../mod/profiles.php:652
 msgid "Private Keywords:"
 msgstr "私人关键字"
 
-#: ../../mod/profiles.php:650 ../../include/profile_advanced.php:62
+#: ../../mod/profiles.php:653 ../../include/profile_advanced.php:62
 msgid "Likes:"
 msgstr ""
 
-#: ../../mod/profiles.php:651 ../../include/profile_advanced.php:64
+#: ../../mod/profiles.php:654 ../../include/profile_advanced.php:64
 msgid "Dislikes:"
 msgstr ""
 
-#: ../../mod/profiles.php:652
+#: ../../mod/profiles.php:655
 msgid "Example: fishing photography software"
 msgstr "例如：钓鱼 照片 软件"
 
-#: ../../mod/profiles.php:653
+#: ../../mod/profiles.php:656
 msgid "(Used for suggesting potential friends, can be seen by others)"
 msgstr "(用于建议可能的朋友们，会被别人看)"
 
-#: ../../mod/profiles.php:654
+#: ../../mod/profiles.php:657
 msgid "(Used for searching profiles, never shown to others)"
 msgstr "(用于搜索简介，没有给别人看)"
 
-#: ../../mod/profiles.php:655
+#: ../../mod/profiles.php:658
 msgid "Tell us about yourself..."
 msgstr "给我们自我介绍..."
 
-#: ../../mod/profiles.php:656
+#: ../../mod/profiles.php:659
 msgid "Hobbies/Interests"
 msgstr "爱好／兴趣"
 
-#: ../../mod/profiles.php:657
+#: ../../mod/profiles.php:660
 msgid "Contact information and Social Networks"
 msgstr "熟人信息和社会化网络"
 
-#: ../../mod/profiles.php:658
+#: ../../mod/profiles.php:661
 msgid "Musical interests"
 msgstr "音乐兴趣"
 
-#: ../../mod/profiles.php:659
+#: ../../mod/profiles.php:662
 msgid "Books, literature"
 msgstr "书，文学"
 
-#: ../../mod/profiles.php:660
+#: ../../mod/profiles.php:663
 msgid "Television"
 msgstr "电视"
 
-#: ../../mod/profiles.php:661
+#: ../../mod/profiles.php:664
 msgid "Film/dance/culture/entertainment"
 msgstr "电影／跳舞／文化／娱乐"
 
-#: ../../mod/profiles.php:662
+#: ../../mod/profiles.php:665
 msgid "Love/romance"
 msgstr "爱情／浪漫"
 
-#: ../../mod/profiles.php:663
+#: ../../mod/profiles.php:666
 msgid "Work/employment"
 msgstr "工作"
 
-#: ../../mod/profiles.php:664
+#: ../../mod/profiles.php:667
 msgid "School/education"
 msgstr "学院／教育"
 
-#: ../../mod/profiles.php:669
+#: ../../mod/profiles.php:672
 msgid ""
 "This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
 "be visible to anybody using the internet."
 msgstr "这是你的<strong>公开的</strong>简介。<br />它<strong>可能</strong>被所有的因特网用的看到。"
 
-#: ../../mod/profiles.php:679 ../../mod/directory.php:111
+#: ../../mod/profiles.php:682 ../../mod/directory.php:111
 #: ../../addon/forumdirectory/forumdirectory.php:133
 msgid "Age: "
 msgstr "年纪："
 
-#: ../../mod/profiles.php:718
+#: ../../mod/profiles.php:721
 msgid "Edit/Manage Profiles"
 msgstr "编辑／管理简介"
 
-#: ../../mod/profiles.php:719 ../../boot.php:1316
+#: ../../mod/profiles.php:722 ../../boot.php:1324
 msgid "Change profile photo"
 msgstr "换简介照片"
 
-#: ../../mod/profiles.php:720 ../../boot.php:1317
+#: ../../mod/profiles.php:723 ../../boot.php:1325
 msgid "Create New Profile"
 msgstr "创造新的简介"
 
-#: ../../mod/profiles.php:731 ../../boot.php:1327
+#: ../../mod/profiles.php:734 ../../boot.php:1335
 msgid "Profile Image"
 msgstr "简介图像"
 
-#: ../../mod/profiles.php:733 ../../boot.php:1330
+#: ../../mod/profiles.php:736 ../../boot.php:1338
 msgid "visible to everybody"
 msgstr "给打假可见的"
 
-#: ../../mod/profiles.php:734 ../../boot.php:1331
+#: ../../mod/profiles.php:737 ../../boot.php:1339
 msgid "Edit visibility"
 msgstr "修改能见度"
 
-#: ../../mod/filer.php:30 ../../include/conversation.php:945
-#: ../../include/conversation.php:963
+#: ../../mod/filer.php:30 ../../include/conversation.php:940
+#: ../../include/conversation.php:958
 msgid "Save to Folder:"
 msgstr ""
 
@@ -4742,34 +4746,38 @@ msgid "Source input: "
 msgstr ""
 
 #: ../../mod/babel.php:35
-msgid "bb2html: "
+msgid "bb2html (raw HTML): "
 msgstr ""
 
 #: ../../mod/babel.php:39
-msgid "bb2html2bb: "
+msgid "bb2html: "
 msgstr ""
 
 #: ../../mod/babel.php:43
-msgid "bb2md: "
+msgid "bb2html2bb: "
 msgstr ""
 
 #: ../../mod/babel.php:47
-msgid "bb2md2html: "
+msgid "bb2md: "
 msgstr ""
 
 #: ../../mod/babel.php:51
-msgid "bb2dia2bb: "
+msgid "bb2md2html: "
 msgstr ""
 
 #: ../../mod/babel.php:55
+msgid "bb2dia2bb: "
+msgstr ""
+
+#: ../../mod/babel.php:59
 msgid "bb2md2html2bb: "
 msgstr ""
 
-#: ../../mod/babel.php:65
+#: ../../mod/babel.php:69
 msgid "Source input (Diaspora format): "
 msgstr ""
 
-#: ../../mod/babel.php:70
+#: ../../mod/babel.php:74
 msgid "diaspora2bb: "
 msgstr ""
 
@@ -4808,19 +4816,19 @@ msgstr "性别："
 
 #: ../../mod/directory.php:136
 #: ../../addon/forumdirectory/forumdirectory.php:158
-#: ../../include/profile_advanced.php:17 ../../boot.php:1352
+#: ../../include/profile_advanced.php:17 ../../boot.php:1360
 msgid "Gender:"
 msgstr "性别:"
 
 #: ../../mod/directory.php:138
 #: ../../addon/forumdirectory/forumdirectory.php:160
-#: ../../include/profile_advanced.php:37 ../../boot.php:1355
+#: ../../include/profile_advanced.php:37 ../../boot.php:1363
 msgid "Status:"
 msgstr "现状:"
 
 #: ../../mod/directory.php:140
 #: ../../addon/forumdirectory/forumdirectory.php:162
-#: ../../include/profile_advanced.php:48 ../../boot.php:1357
+#: ../../include/profile_advanced.php:48 ../../boot.php:1365
 msgid "Homepage:"
 msgstr "主页:"
 
@@ -4953,7 +4961,7 @@ msgstr "介绍失败或被吊销。"
 msgid "Unable to set contact photo."
 msgstr "不会指定熟人照片。"
 
-#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:619
+#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:621
 #: ../../include/conversation.php:171
 #, php-format
 msgid "%1$s is now friends with %2$s"
@@ -5721,7 +5729,7 @@ msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:28
 #: ../../addon/communityhome/communityhome.php:34 ../../include/nav.php:64
-#: ../../boot.php:1008 ../../addon.old/communityhome/communityhome.php:28
+#: ../../boot.php:1016 ../../addon.old/communityhome/communityhome.php:28
 #: ../../addon.old/communityhome/communityhome.php:34
 #: ../../addon.old/communityhome/twillingham/communityhome.php:28
 #: ../../addon.old/communityhome/twillingham/communityhome.php:34
@@ -6326,7 +6334,7 @@ msgstr ""
 
 #: ../../addon/dav/friendica/main.php:279
 #: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:468
-#: ../../include/enotify.php:28 ../../include/notifier.php:781
+#: ../../include/enotify.php:28 ../../include/notifier.php:785
 #: ../../addon.old/dav/friendica/main.php:279
 #: ../../addon.old/dav/friendica/main.php:280
 msgid "noreply"
@@ -8362,7 +8370,7 @@ msgstr "开始："
 msgid "Finishes:"
 msgstr "结束："
 
-#: ../../include/delivery.php:457 ../../include/notifier.php:771
+#: ../../include/delivery.php:457 ../../include/notifier.php:775
 msgid "(no subject)"
 msgstr "沒有题目"
 
@@ -8608,11 +8616,11 @@ msgstr ""
 msgid "Item filed"
 msgstr ""
 
-#: ../../include/diaspora.php:702
+#: ../../include/diaspora.php:704
 msgid "Sharing notification from Diaspora network"
 msgstr "分享通知从Diaspora网络"
 
-#: ../../include/diaspora.php:2239
+#: ../../include/diaspora.php:2248
 msgid "Attachments:"
 msgstr "附件："
 
@@ -8698,7 +8706,7 @@ msgstr "创造新组"
 msgid "Contacts not in any group"
 msgstr ""
 
-#: ../../include/nav.php:46 ../../boot.php:1007
+#: ../../include/nav.php:46 ../../boot.php:1015
 msgid "Logout"
 msgstr "注销"
 
@@ -8706,7 +8714,7 @@ msgstr "注销"
 msgid "End this session"
 msgstr "结束这段时间"
 
-#: ../../include/nav.php:49 ../../boot.php:1805
+#: ../../include/nav.php:49 ../../boot.php:1812
 msgid "Status"
 msgstr "现状"
 
@@ -8798,7 +8806,7 @@ msgstr "管理别的页"
 msgid "Delegations"
 msgstr ""
 
-#: ../../include/nav.php:142 ../../boot.php:1310
+#: ../../include/nav.php:142 ../../boot.php:1318
 msgid "Profiles"
 msgstr "简介"
 
@@ -9525,11 +9533,11 @@ msgstr "文章／项目"
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr "%1$s标注%2$s的%3$s为偏爱"
 
-#: ../../include/conversation.php:620 ../../object/Item.php:248
+#: ../../include/conversation.php:620 ../../object/Item.php:249
 msgid "Categories:"
 msgstr ""
 
-#: ../../include/conversation.php:621 ../../object/Item.php:249
+#: ../../include/conversation.php:621 ../../object/Item.php:250
 msgid "Filed under:"
 msgstr ""
 
@@ -9555,62 +9563,60 @@ msgstr "%s喜欢这个."
 msgid "%s doesn't like this."
 msgstr "%s没有喜欢这个."
 
-#: ../../include/conversation.php:884
-msgid "like this"
+#: ../../include/conversation.php:883
+#, php-format
+msgid "<span  %1$s>%2$d people</span> like this"
 msgstr ""
 
-#: ../../include/conversation.php:888
-msgid "don't like this"
+#: ../../include/conversation.php:886
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't like this"
 msgstr ""
 
-#: ../../include/conversation.php:895
-msgid "people"
-msgstr ""
-
-#: ../../include/conversation.php:905
+#: ../../include/conversation.php:900
 msgid "and"
 msgstr "和"
 
-#: ../../include/conversation.php:911
+#: ../../include/conversation.php:906
 #, php-format
 msgid ", and %d other people"
 msgstr "，和%d别人"
 
-#: ../../include/conversation.php:913
+#: ../../include/conversation.php:908
 #, php-format
 msgid "%s like this."
 msgstr "%s喜欢这个"
 
-#: ../../include/conversation.php:913
+#: ../../include/conversation.php:908
 #, php-format
 msgid "%s don't like this."
 msgstr "%s不喜欢这个"
 
-#: ../../include/conversation.php:940 ../../include/conversation.php:958
+#: ../../include/conversation.php:935 ../../include/conversation.php:953
 msgid "Visible to <strong>everybody</strong>"
 msgstr "<strong>大家</strong>可见的"
 
-#: ../../include/conversation.php:942 ../../include/conversation.php:960
+#: ../../include/conversation.php:937 ../../include/conversation.php:955
 msgid "Please enter a video link/URL:"
 msgstr "请输入视频连接／URL："
 
-#: ../../include/conversation.php:943 ../../include/conversation.php:961
+#: ../../include/conversation.php:938 ../../include/conversation.php:956
 msgid "Please enter an audio link/URL:"
 msgstr "请输入音响连接／URL："
 
-#: ../../include/conversation.php:944 ../../include/conversation.php:962
+#: ../../include/conversation.php:939 ../../include/conversation.php:957
 msgid "Tag term:"
 msgstr "标签:"
 
-#: ../../include/conversation.php:946 ../../include/conversation.php:964
+#: ../../include/conversation.php:941 ../../include/conversation.php:959
 msgid "Where are you right now?"
 msgstr "你在哪里?"
 
-#: ../../include/conversation.php:947
+#: ../../include/conversation.php:942
 msgid "Delete item(s)?"
 msgstr ""
 
-#: ../../include/conversation.php:1026
+#: ../../include/conversation.php:1021
 msgid "permissions"
 msgstr "权利"
 
@@ -9644,115 +9650,115 @@ msgstr ""
 msgid "Update Error at %s"
 msgstr ""
 
-#: ../../boot.php:982
+#: ../../boot.php:990
 msgid "Create a New Account"
 msgstr "创造新的账户"
 
-#: ../../boot.php:1010
+#: ../../boot.php:1018
 msgid "Nickname or Email address: "
 msgstr "绰号或电子邮件地址: "
 
-#: ../../boot.php:1011
+#: ../../boot.php:1019
 msgid "Password: "
 msgstr "密码: "
 
-#: ../../boot.php:1012
+#: ../../boot.php:1020
 msgid "Remember me"
 msgstr ""
 
-#: ../../boot.php:1015
+#: ../../boot.php:1023
 msgid "Or login using OpenID: "
 msgstr "或者用OpenID登记："
 
-#: ../../boot.php:1021
+#: ../../boot.php:1029
 msgid "Forgot your password?"
 msgstr "忘记你的密码吗？"
 
-#: ../../boot.php:1024
+#: ../../boot.php:1032
 msgid "Website Terms of Service"
 msgstr ""
 
-#: ../../boot.php:1025
+#: ../../boot.php:1033
 msgid "terms of service"
 msgstr ""
 
-#: ../../boot.php:1027
+#: ../../boot.php:1035
 msgid "Website Privacy Policy"
 msgstr ""
 
-#: ../../boot.php:1028
+#: ../../boot.php:1036
 msgid "privacy policy"
 msgstr ""
 
-#: ../../boot.php:1157
+#: ../../boot.php:1165
 msgid "Requested account is not available."
 msgstr ""
 
-#: ../../boot.php:1236
+#: ../../boot.php:1244
 msgid "Edit profile"
 msgstr "修改简介"
 
-#: ../../boot.php:1302
+#: ../../boot.php:1310
 msgid "Message"
 msgstr ""
 
-#: ../../boot.php:1310
+#: ../../boot.php:1318
 msgid "Manage/edit profiles"
 msgstr "管理/修改简介"
 
-#: ../../boot.php:1433 ../../boot.php:1519
+#: ../../boot.php:1440 ../../boot.php:1526
 msgid "g A l F d"
 msgstr "g A l d F"
 
-#: ../../boot.php:1434 ../../boot.php:1520
+#: ../../boot.php:1441 ../../boot.php:1527
 msgid "F d"
 msgstr "F d"
 
-#: ../../boot.php:1479 ../../boot.php:1560
+#: ../../boot.php:1486 ../../boot.php:1567
 msgid "[today]"
 msgstr "[今天]"
 
-#: ../../boot.php:1491
+#: ../../boot.php:1498
 msgid "Birthday Reminders"
 msgstr "提醒生日"
 
-#: ../../boot.php:1492
+#: ../../boot.php:1499
 msgid "Birthdays this week:"
 msgstr "这周的生日:"
 
-#: ../../boot.php:1553
+#: ../../boot.php:1560
 msgid "[No description]"
 msgstr "[无描述]"
 
-#: ../../boot.php:1571
+#: ../../boot.php:1578
 msgid "Event Reminders"
 msgstr "事件提醒"
 
-#: ../../boot.php:1572
+#: ../../boot.php:1579
 msgid "Events this week:"
 msgstr "这周的事件:"
 
-#: ../../boot.php:1808
+#: ../../boot.php:1815
 msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../boot.php:1815
+#: ../../boot.php:1822
 msgid "Profile Details"
 msgstr ""
 
-#: ../../boot.php:1832
+#: ../../boot.php:1839
 msgid "Events and Calendar"
 msgstr ""
 
-#: ../../boot.php:1839
+#: ../../boot.php:1846
 msgid "Only You Can See This"
 msgstr ""
 
-#: ../../object/Item.php:260
+#: ../../object/Item.php:261
 msgid "via"
 msgstr ""
 
-#: ../../index.php:392
+#: ../../index.php:399
 msgid "toggle mobile"
 msgstr ""
 
diff --git a/view/zh-cn/strings.php b/view/zh-cn/strings.php
index 229c8e4c43..b164fa2dcd 100644
--- a/view/zh-cn/strings.php
+++ b/view/zh-cn/strings.php
@@ -53,6 +53,7 @@ $a->strings["Description:"] = "描述：";
 $a->strings["Location:"] = "位置:";
 $a->strings["Title:"] = "";
 $a->strings["Share this event"] = "分享这个项目";
+$a->strings["System down for maintenance"] = "";
 $a->strings["Cancel"] = "退消";
 $a->strings["Tag removed"] = "标签去除了";
 $a->strings["Remove Item Tag"] = "去除项目标签";
@@ -1040,6 +1041,7 @@ $a->strings["No entries."] = "没有项目。";
 $a->strings["Source (bbcode) text:"] = "";
 $a->strings["Source (Diaspora) text to convert to BBcode:"] = "";
 $a->strings["Source input: "] = "";
+$a->strings["bb2html (raw HTML): "] = "";
 $a->strings["bb2html: "] = "";
 $a->strings["bb2html2bb: "] = "";
 $a->strings["bb2md: "] = "";
@@ -2051,9 +2053,8 @@ $a->strings["Delete Selected Items"] = "删除选的项目";
 $a->strings["Follow Thread"] = "";
 $a->strings["%s likes this."] = "%s喜欢这个.";
 $a->strings["%s doesn't like this."] = "%s没有喜欢这个.";
-$a->strings["like this"] = "";
-$a->strings["don't like this"] = "";
-$a->strings["people"] = "";
+$a->strings["<span  %1\$s>%2\$d people</span> like this"] = "";
+$a->strings["<span  %1\$s>%2\$d people</span> don't like this"] = "";
 $a->strings["and"] = "和";
 $a->strings[", and %d other people"] = "，和%d别人";
 $a->strings["%s like this."] = "%s喜欢这个";