]> git.mxchange.org Git - friendica.git/commitdiff
ZH-CN: update to the strings
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Thu, 10 Jan 2013 05:49:35 +0000 (06:49 +0100)
committerTobias Diekershoff <tobias.diekershoff@gmx.net>
Thu, 10 Jan 2013 05:49:35 +0000 (06:49 +0100)
view/zh-cn/messages.po
view/zh-cn/strings.php

index 2dff6697fa30a4b58d5efe221bd525c9cb28b3c7..0fdcb2eae3acced879a95a8ef6097db3461f0401 100644 (file)
@@ -4,13 +4,13 @@
 # 
 # Translators:
 # Mike Macgirvin, 2010.
-#   <transifex.mexon@spamgourmet.com>, 2012.
+#   <transifex.mexon@spamgourmet.com>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
-"POT-Creation-Date: 2012-11-22 10:00-0800\n"
-"PO-Revision-Date: 2012-11-24 16:29+0000\n"
+"POT-Creation-Date: 2013-01-08 10:00-0800\n"
+"PO-Revision-Date: 2013-01-09 14:14+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"
@@ -40,28 +40,29 @@ msgstr "熟人更新失败。"
 #: ../../mod/crepair.php:115 ../../mod/wall_attach.php:55
 #: ../../mod/fsuggest.php:78 ../../mod/events.php:140 ../../mod/api.php:26
 #: ../../mod/api.php:31 ../../mod/photos.php:133 ../../mod/photos.php:995
-#: ../../mod/editpost.php:10 ../../mod/install.php:151 ../../mod/poke.php:135
-#: ../../mod/notifications.php:66 ../../mod/contacts.php:146
-#: ../../mod/settings.php:86 ../../mod/settings.php:525
-#: ../../mod/settings.php:530 ../../mod/manage.php:90 ../../mod/network.php:6
+#: ../../mod/editpost.php:10 ../../mod/install.php:155 ../../mod/poke.php:135
+#: ../../mod/notifications.php:66 ../../mod/contacts.php:147
+#: ../../mod/settings.php:91 ../../mod/settings.php:542
+#: ../../mod/settings.php:547 ../../mod/manage.php:90 ../../mod/network.php:6
 #: ../../mod/notes.php:20 ../../mod/uimport.php:23 ../../mod/wallmessage.php:9
 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33
 #: ../../mod/group.php:19 ../../mod/viewcontacts.php:22
-#: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:139
+#: ../../mod/register.php:40 ../../mod/regmod.php:125 ../../mod/item.php:139
 #: ../../mod/item.php:155 ../../mod/mood.php:114
 #: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:169
 #: ../../mod/profile_photo.php:180 ../../mod/profile_photo.php:193
-#: ../../mod/message.php:38 ../../mod/message.php:168
+#: ../../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:165 ../../mod/profiles.php:7
-#: ../../mod/profiles.php:424 ../../mod/delegate.php:6
-#: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
-#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510
-#: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159
-#: ../../addon/fbpost/fbpost.php:165
-#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3977
+#: ../../mod/display.php:173 ../../mod/profiles.php:9
+#: ../../mod/profiles.php:148 ../../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:3994
 #: ../../index.php:333 ../../addon.old/facebook/facebook.php:510
 #: ../../addon.old/facebook/facebook.php:516
 #: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165
@@ -92,10 +93,10 @@ msgstr "请<strong>立即</strong>用后退按钮如果您不确定怎么用这
 
 #: ../../mod/crepair.php:144
 msgid "Return to contact editor"
-msgstr ""
+msgstr "回归熟人处理器"
 
-#: ../../mod/crepair.php:148 ../../mod/settings.php:545
-#: ../../mod/settings.php:571 ../../mod/admin.php:692 ../../mod/admin.php:702
+#: ../../mod/crepair.php:148 ../../mod/settings.php:562
+#: ../../mod/settings.php:588 ../../mod/admin.php:731 ../../mod/admin.php:741
 msgid "Name"
 msgstr "名字"
 
@@ -132,59 +133,60 @@ msgid "New photo from this URL"
 msgstr "新照片从这个URL"
 
 #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
-#: ../../mod/events.php:455 ../../mod/photos.php:1028
-#: ../../mod/photos.php:1104 ../../mod/photos.php:1367
-#: ../../mod/photos.php:1407 ../../mod/photos.php:1451
-#: ../../mod/photos.php:1523 ../../mod/install.php:246
-#: ../../mod/install.php:284 ../../mod/localtime.php:45 ../../mod/poke.php:199
-#: ../../mod/content.php:693 ../../mod/contacts.php:351
-#: ../../mod/settings.php:543 ../../mod/settings.php:697
-#: ../../mod/settings.php:769 ../../mod/settings.php:976
-#: ../../mod/group.php:85 ../../mod/mood.php:137 ../../mod/message.php:294
-#: ../../mod/message.php:480 ../../mod/admin.php:443 ../../mod/admin.php:689
-#: ../../mod/admin.php:826 ../../mod/admin.php:1025 ../../mod/admin.php:1112
-#: ../../mod/profiles.php:594 ../../mod/invite.php:119
-#: ../../addon/fromgplus/fromgplus.php:40
-#: ../../addon/facebook/facebook.php:619
+#: ../../mod/events.php:466 ../../mod/photos.php:1028
+#: ../../mod/photos.php:1118 ../../mod/photos.php:1402
+#: ../../mod/photos.php:1442 ../../mod/photos.php:1486
+#: ../../mod/photos.php:1569 ../../mod/install.php:252
+#: ../../mod/install.php:290 ../../mod/localtime.php:45 ../../mod/poke.php:199
+#: ../../mod/content.php:710 ../../mod/contacts.php:352
+#: ../../mod/settings.php:560 ../../mod/settings.php:670
+#: ../../mod/settings.php:739 ../../mod/settings.php:811
+#: ../../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/invite.php:121 ../../addon/fromgplus/fromgplus.php:44
+#: ../../addon/facebook/facebook.php:621
 #: ../../addon/snautofollow/snautofollow.php:64
-#: ../../addon/fbpost/fbpost.php:226 ../../addon/yourls/yourls.php:76
+#: ../../addon/fbpost/fbpost.php:280 ../../addon/yourls/yourls.php:76
 #: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:88
 #: ../../addon/page/page.php:211 ../../addon/planets/planets.php:158
 #: ../../addon/uhremotestorage/uhremotestorage.php:89
 #: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93
-#: ../../addon/remote_permissions/remote_permissions.php:47
-#: ../../addon/remote_permissions/remote_permissions.php:195
+#: ../../addon/remote_permissions/remote_permissions.php:48
+#: ../../addon/remote_permissions/remote_permissions.php:196
 #: ../../addon/startpage/startpage.php:92
 #: ../../addon/geonames/geonames.php:187
-#: ../../addon/forumlist/forumlist.php:175
+#: ../../addon/forumlist/forumlist.php:178
 #: ../../addon/impressum/impressum.php:83
 #: ../../addon/notimeline/notimeline.php:64 ../../addon/blockem/blockem.php:57
 #: ../../addon/qcomment/qcomment.php:61
 #: ../../addon/openstreetmap/openstreetmap.php:70
 #: ../../addon/group_text/group_text.php:84
 #: ../../addon/libravatar/libravatar.php:99
-#: ../../addon/libertree/libertree.php:90 ../../addon/altpager/altpager.php:87
-#: ../../addon/mathjax/mathjax.php:42 ../../addon/editplain/editplain.php:84
-#: ../../addon/blackout/blackout.php:98 ../../addon/gravatar/gravatar.php:95
+#: ../../addon/libertree/libertree.php:90 ../../addon/altpager/altpager.php:91
+#: ../../addon/altpager/altpager.php:98 ../../addon/mathjax/mathjax.php:42
+#: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:99
+#: ../../addon/gravatar/gravatar.php:95
 #: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93
 #: ../../addon/jappixmini/jappixmini.php:307
-#: ../../addon/statusnet/statusnet.php:278
-#: ../../addon/statusnet/statusnet.php:292
-#: ../../addon/statusnet/statusnet.php:318
-#: ../../addon/statusnet/statusnet.php:325
-#: ../../addon/statusnet/statusnet.php:353
-#: ../../addon/statusnet/statusnet.php:576 ../../addon/tumblr/tumblr.php:90
+#: ../../addon/statusnet/statusnet.php:290
+#: ../../addon/statusnet/statusnet.php:304
+#: ../../addon/statusnet/statusnet.php:330
+#: ../../addon/statusnet/statusnet.php:337
+#: ../../addon/statusnet/statusnet.php:374
+#: ../../addon/statusnet/statusnet.php:752 ../../addon/tumblr/tumblr.php:233
 #: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88
 #: ../../addon/wppost/wppost.php:110 ../../addon/showmore/showmore.php:48
-#: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180
-#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:394
+#: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:191
+#: ../../addon/twitter/twitter.php:229 ../../addon/twitter/twitter.php:554
 #: ../../addon/irc/irc.php:55 ../../addon/fromapp/fromapp.php:77
 #: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103
 #: ../../view/theme/cleanzero/config.php:80
-#: ../../view/theme/diabook/theme.php:645
+#: ../../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:564 ../../addon.old/fromgplus/fromgplus.php:40
+#: ../../object/Item.php:609 ../../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
@@ -284,85 +286,87 @@ msgstr "l, F j"
 msgid "Edit event"
 msgstr "编项目"
 
-#: ../../mod/events.php:323 ../../include/text.php:1190
+#: ../../mod/events.php:323 ../../include/text.php:1247
 msgid "link to source"
 msgstr "链接到来源"
 
-#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:91
-#: ../../include/nav.php:52 ../../boot.php:1746
+#: ../../mod/events.php:358 ../../view/theme/diabook/theme.php:91
+#: ../../include/nav.php:52 ../../boot.php:1805
 msgid "Events"
 msgstr "事件"
 
-#: ../../mod/events.php:348
+#: ../../mod/events.php:359
 msgid "Create New Event"
 msgstr "造成新的项目"
 
-#: ../../mod/events.php:349 ../../addon/dav/friendica/layout.fnk.php:263
+#: ../../mod/events.php:360 ../../addon/dav/friendica/layout.fnk.php:263
 #: ../../addon.old/dav/friendica/layout.fnk.php:263
 msgid "Previous"
 msgstr "上"
 
-#: ../../mod/events.php:350 ../../mod/install.php:205
+#: ../../mod/events.php:361 ../../mod/install.php:211
 #: ../../addon/dav/friendica/layout.fnk.php:266
 #: ../../addon.old/dav/friendica/layout.fnk.php:266
 msgid "Next"
 msgstr "下"
 
-#: ../../mod/events.php:423
+#: ../../mod/events.php:434
 msgid "hour:minute"
 msgstr "小时:分钟"
 
-#: ../../mod/events.php:433
+#: ../../mod/events.php:444
 msgid "Event details"
 msgstr "项目内容"
 
-#: ../../mod/events.php:434
+#: ../../mod/events.php:445
 #, php-format
 msgid "Format is %s %s. Starting date and Title are required."
 msgstr ""
 
-#: ../../mod/events.php:436
+#: ../../mod/events.php:447
 msgid "Event Starts:"
 msgstr "事件开始:"
 
-#: ../../mod/events.php:436 ../../mod/events.php:450
+#: ../../mod/events.php:447 ../../mod/events.php:461
 msgid "Required"
 msgstr ""
 
-#: ../../mod/events.php:439
+#: ../../mod/events.php:450
 msgid "Finish date/time is not known or not relevant"
 msgstr "结束日/时未知或无关"
 
-#: ../../mod/events.php:441
+#: ../../mod/events.php:452
 msgid "Event Finishes:"
 msgstr "事件结束:"
 
-#: ../../mod/events.php:444
+#: ../../mod/events.php:455
 msgid "Adjust for viewer timezone"
 msgstr "调为观众的时间"
 
-#: ../../mod/events.php:446
+#: ../../mod/events.php:457
 msgid "Description:"
 msgstr "描述:"
 
-#: ../../mod/events.php:448 ../../mod/directory.php:134
-#: ../../include/event.php:40 ../../include/bb2diaspora.php:412
-#: ../../boot.php:1276
+#: ../../mod/events.php:459 ../../mod/directory.php:134
+#: ../../addon/forumdirectory/forumdirectory.php:156
+#: ../../include/event.php:40 ../../include/bb2diaspora.php:415
+#: ../../boot.php:1326
 msgid "Location:"
 msgstr "位置:"
 
-#: ../../mod/events.php:450
+#: ../../mod/events.php:461
 msgid "Title:"
 msgstr ""
 
-#: ../../mod/events.php:452
+#: ../../mod/events.php:463
 msgid "Share this event"
 msgstr "分享这个项目"
 
-#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:142
-#: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544
-#: ../../mod/settings.php:570 ../../addon/js_upload/js_upload.php:45
-#: ../../include/conversation.php:1005
+#: ../../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
 #: ../../addon.old/js_upload/js_upload.php:45
 msgid "Cancel"
 msgstr "退消"
@@ -408,44 +412,44 @@ msgid ""
 " and/or create new posts for you?"
 msgstr "您想不想使这个应用用权您的文章和熟人,和/或代您造成新文章"
 
-#: ../../mod/api.php:105 ../../mod/dfrn_request.php:835
-#: ../../mod/settings.php:892 ../../mod/settings.php:898
-#: ../../mod/settings.php:906 ../../mod/settings.php:910
-#: ../../mod/settings.php:915 ../../mod/settings.php:921
-#: ../../mod/settings.php:927 ../../mod/settings.php:933
-#: ../../mod/settings.php:963 ../../mod/settings.php:964
-#: ../../mod/settings.php:965 ../../mod/settings.php:966
-#: ../../mod/settings.php:967 ../../mod/register.php:237
-#: ../../mod/profiles.php:574
+#: ../../mod/api.php:105 ../../mod/dfrn_request.php:836
+#: ../../mod/settings.php:934 ../../mod/settings.php:940
+#: ../../mod/settings.php:948 ../../mod/settings.php:952
+#: ../../mod/settings.php:957 ../../mod/settings.php:963
+#: ../../mod/settings.php:969 ../../mod/settings.php:975
+#: ../../mod/settings.php:1005 ../../mod/settings.php:1006
+#: ../../mod/settings.php:1007 ../../mod/settings.php:1008
+#: ../../mod/settings.php:1009 ../../mod/register.php:254
+#: ../../mod/profiles.php:603
 msgid "Yes"
 msgstr "是"
 
-#: ../../mod/api.php:106 ../../mod/dfrn_request.php:836
-#: ../../mod/settings.php:892 ../../mod/settings.php:898
-#: ../../mod/settings.php:906 ../../mod/settings.php:910
-#: ../../mod/settings.php:915 ../../mod/settings.php:921
-#: ../../mod/settings.php:927 ../../mod/settings.php:933
-#: ../../mod/settings.php:963 ../../mod/settings.php:964
-#: ../../mod/settings.php:965 ../../mod/settings.php:966
-#: ../../mod/settings.php:967 ../../mod/register.php:238
-#: ../../mod/profiles.php:575
+#: ../../mod/api.php:106 ../../mod/dfrn_request.php:837
+#: ../../mod/settings.php:934 ../../mod/settings.php:940
+#: ../../mod/settings.php:948 ../../mod/settings.php:952
+#: ../../mod/settings.php:957 ../../mod/settings.php:963
+#: ../../mod/settings.php:969 ../../mod/settings.php:975
+#: ../../mod/settings.php:1005 ../../mod/settings.php:1006
+#: ../../mod/settings.php:1007 ../../mod/settings.php:1008
+#: ../../mod/settings.php:1009 ../../mod/register.php:255
+#: ../../mod/profiles.php:604
 msgid "No"
 msgstr "否"
 
-#: ../../mod/photos.php:51 ../../boot.php:1739
+#: ../../mod/photos.php:51 ../../boot.php:1798
 msgid "Photo Albums"
 msgstr "相册"
 
 #: ../../mod/photos.php:59 ../../mod/photos.php:154 ../../mod/photos.php:1009
-#: ../../mod/photos.php:1096 ../../mod/photos.php:1111
-#: ../../mod/photos.php:1566 ../../mod/photos.php:1578
-#: ../../addon/communityhome/communityhome.php:110
-#: ../../view/theme/diabook/theme.php:529
+#: ../../mod/photos.php:1102 ../../mod/photos.php:1125
+#: ../../mod/photos.php:1626 ../../mod/photos.php:1638
+#: ../../addon/communityhome/communityhome.php:115
+#: ../../view/theme/diabook/theme.php:492
 #: ../../addon.old/communityhome/communityhome.php:110
 msgid "Contact Photos"
 msgstr "熟人照片"
 
-#: ../../mod/photos.php:66 ../../mod/photos.php:1127 ../../mod/photos.php:1616
+#: ../../mod/photos.php:66 ../../mod/photos.php:1141 ../../mod/photos.php:1685
 msgid "Upload New Photos"
 msgstr "上传新照片"
 
@@ -457,14 +461,14 @@ msgstr "每人"
 msgid "Contact information unavailable"
 msgstr "熟人信息不可用"
 
-#: ../../mod/photos.php:154 ../../mod/photos.php:676 ../../mod/photos.php:1096
-#: ../../mod/photos.php:1111 ../../mod/profile_photo.php:74
+#: ../../mod/photos.php:154 ../../mod/photos.php:676 ../../mod/photos.php:1102
+#: ../../mod/photos.php:1125 ../../mod/profile_photo.php:74
 #: ../../mod/profile_photo.php:81 ../../mod/profile_photo.php:88
 #: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296
 #: ../../mod/profile_photo.php:305
-#: ../../addon/communityhome/communityhome.php:111
-#: ../../view/theme/diabook/theme.php:530 ../../include/user.php:324
-#: ../../include/user.php:331 ../../include/user.php:338
+#: ../../addon/communityhome/communityhome.php:116
+#: ../../view/theme/diabook/theme.php:493 ../../include/user.php:325
+#: ../../include/user.php:332 ../../include/user.php:339
 #: ../../addon.old/communityhome/communityhome.php:111
 msgid "Profile Photos"
 msgstr "简介照片"
@@ -473,11 +477,11 @@ msgstr "简介照片"
 msgid "Album not found."
 msgstr "取回不了相册."
 
-#: ../../mod/photos.php:182 ../../mod/photos.php:1105
+#: ../../mod/photos.php:182 ../../mod/photos.php:1119
 msgid "Delete Album"
 msgstr "删除相册"
 
-#: ../../mod/photos.php:245 ../../mod/photos.php:1368
+#: ../../mod/photos.php:245 ../../mod/photos.php:1403
 msgid "Delete Photo"
 msgstr "删除照片"
 
@@ -490,7 +494,7 @@ msgstr ""
 msgid "a photo"
 msgstr ""
 
-#: ../../mod/photos.php:712 ../../addon/js_upload/js_upload.php:315
+#: ../../mod/photos.php:712 ../../addon/js_upload/js_upload.php:321
 #: ../../addon.old/js_upload/js_upload.php:315
 msgid "Image exceeds size limit of "
 msgstr "图片超出最大尺寸"
@@ -510,8 +514,9 @@ msgid "Image upload failed."
 msgstr "图像上载失败了."
 
 #: ../../mod/photos.php:865 ../../mod/community.php:18
-#: ../../mod/dfrn_request.php:760 ../../mod/viewcontacts.php:17
-#: ../../mod/display.php:7 ../../mod/search.php:86 ../../mod/directory.php:31
+#: ../../mod/dfrn_request.php:761 ../../mod/viewcontacts.php:17
+#: ../../mod/display.php:7 ../../mod/search.php:89 ../../mod/directory.php:31
+#: ../../addon/forumdirectory/forumdirectory.php:53
 msgid "Public access denied."
 msgstr "公众看拒绝"
 
@@ -523,167 +528,162 @@ msgstr "没有照片挑选了"
 msgid "Access to this item is restricted."
 msgstr "这个项目使用权限的。"
 
-#: ../../mod/photos.php:1038
+#: ../../mod/photos.php:1037
 #, php-format
 msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
 msgstr ""
 
-#: ../../mod/photos.php:1041
-#, php-format
-msgid "You have used %1$.2f Mbytes of photo storage."
-msgstr ""
-
-#: ../../mod/photos.php:1047
+#: ../../mod/photos.php:1053
 msgid "Upload Photos"
 msgstr "上传照片"
 
-#: ../../mod/photos.php:1051 ../../mod/photos.php:1100
+#: ../../mod/photos.php:1057 ../../mod/photos.php:1114
 msgid "New album name: "
 msgstr "新册名:"
 
-#: ../../mod/photos.php:1052
+#: ../../mod/photos.php:1058
 msgid "or existing album name: "
 msgstr "或现有册名"
 
-#: ../../mod/photos.php:1053
+#: ../../mod/photos.php:1059
 msgid "Do not show a status post for this upload"
 msgstr "别显示现状报到关于这个上传"
 
-#: ../../mod/photos.php:1055 ../../mod/photos.php:1363
+#: ../../mod/photos.php:1061 ../../mod/photos.php:1398
 msgid "Permissions"
 msgstr "权利"
 
-#: ../../mod/photos.php:1115
+#: ../../mod/photos.php:1129
 msgid "Edit Album"
 msgstr "编照片册"
 
-#: ../../mod/photos.php:1121
+#: ../../mod/photos.php:1135
 msgid "Show Newest First"
 msgstr ""
 
-#: ../../mod/photos.php:1123
+#: ../../mod/photos.php:1137
 msgid "Show Oldest First"
 msgstr ""
 
-#: ../../mod/photos.php:1147 ../../mod/photos.php:1599
+#: ../../mod/photos.php:1170 ../../mod/photos.php:1668
 msgid "View Photo"
 msgstr "看照片"
 
-#: ../../mod/photos.php:1182
+#: ../../mod/photos.php:1205
 msgid "Permission denied. Access to this item may be restricted."
 msgstr "无权利。用这个项目可能受限制。"
 
-#: ../../mod/photos.php:1184
+#: ../../mod/photos.php:1207
 msgid "Photo not available"
 msgstr "照片不可获得的 "
 
-#: ../../mod/photos.php:1240
+#: ../../mod/photos.php:1263
 msgid "View photo"
 msgstr "看照片"
 
-#: ../../mod/photos.php:1240
+#: ../../mod/photos.php:1263
 msgid "Edit photo"
 msgstr "编辑照片"
 
-#: ../../mod/photos.php:1241
+#: ../../mod/photos.php:1264
 msgid "Use as profile photo"
 msgstr "用为资料图"
 
-#: ../../mod/photos.php:1247 ../../mod/content.php:603
-#: ../../object/Item.php:104
+#: ../../mod/photos.php:1270 ../../mod/content.php:620
+#: ../../object/Item.php:105
 msgid "Private Message"
 msgstr "私人的新闻"
 
-#: ../../mod/photos.php:1266
+#: ../../mod/photos.php:1289
 msgid "View Full Size"
 msgstr "看全尺寸"
 
-#: ../../mod/photos.php:1340
+#: ../../mod/photos.php:1363
 msgid "Tags: "
 msgstr "标签:"
 
-#: ../../mod/photos.php:1343
+#: ../../mod/photos.php:1366
 msgid "[Remove any tag]"
 msgstr "[删除任何标签]"
 
-#: ../../mod/photos.php:1353
+#: ../../mod/photos.php:1388
 msgid "Rotate CW (right)"
 msgstr ""
 
-#: ../../mod/photos.php:1354
+#: ../../mod/photos.php:1389
 msgid "Rotate CCW (left)"
 msgstr ""
 
-#: ../../mod/photos.php:1356
+#: ../../mod/photos.php:1391
 msgid "New album name"
 msgstr "新册名"
 
-#: ../../mod/photos.php:1359
+#: ../../mod/photos.php:1394
 msgid "Caption"
 msgstr "字幕"
 
-#: ../../mod/photos.php:1361
+#: ../../mod/photos.php:1396
 msgid "Add a Tag"
 msgstr "加标签"
 
-#: ../../mod/photos.php:1365
+#: ../../mod/photos.php:1400
 msgid ""
 "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr "例子:@zhang, @Zhang_San, @li@example.com, #Beijing, #ktv"
 
-#: ../../mod/photos.php:1385 ../../mod/content.php:667
-#: ../../object/Item.php:197
+#: ../../mod/photos.php:1420 ../../mod/content.php:684
+#: ../../object/Item.php:203
 msgid "I like this (toggle)"
 msgstr "我喜欢这(交替)"
 
-#: ../../mod/photos.php:1386 ../../mod/content.php:668
-#: ../../object/Item.php:198
+#: ../../mod/photos.php:1421 ../../mod/content.php:685
+#: ../../object/Item.php:204
 msgid "I don't like this (toggle)"
 msgstr "我不喜欢这(交替)"
 
-#: ../../mod/photos.php:1387 ../../include/conversation.php:966
+#: ../../mod/photos.php:1422 ../../include/conversation.php:1005
 msgid "Share"
 msgstr "分享"
 
-#: ../../mod/photos.php:1388 ../../mod/editpost.php:118
-#: ../../mod/content.php:482 ../../mod/content.php:848
-#: ../../mod/wallmessage.php:152 ../../mod/message.php:293
-#: ../../mod/message.php:481 ../../include/conversation.php:624
-#: ../../include/conversation.php:985 ../../object/Item.php:263
+#: ../../mod/photos.php:1423 ../../mod/editpost.php:121
+#: ../../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
 msgid "Please wait"
 msgstr "请等一下"
 
-#: ../../mod/photos.php:1404 ../../mod/photos.php:1448
-#: ../../mod/photos.php:1520 ../../mod/content.php:690
-#: ../../object/Item.php:561
+#: ../../mod/photos.php:1439 ../../mod/photos.php:1483
+#: ../../mod/photos.php:1566 ../../mod/content.php:707
+#: ../../object/Item.php:606
 msgid "This is you"
 msgstr "这是你"
 
-#: ../../mod/photos.php:1406 ../../mod/photos.php:1450
-#: ../../mod/photos.php:1522 ../../mod/content.php:692 ../../boot.php:606
-#: ../../object/Item.php:260 ../../object/Item.php:563
+#: ../../mod/photos.php:1441 ../../mod/photos.php:1485
+#: ../../mod/photos.php:1568 ../../mod/content.php:709 ../../boot.php:635
+#: ../../object/Item.php:289 ../../object/Item.php:608
 msgid "Comment"
 msgstr "评论"
 
-#: ../../mod/photos.php:1408 ../../mod/photos.php:1452
-#: ../../mod/photos.php:1524 ../../mod/editpost.php:139
-#: ../../mod/content.php:702 ../../include/conversation.php:1003
-#: ../../object/Item.php:573
+#: ../../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
 msgid "Preview"
 msgstr "预演"
 
-#: ../../mod/photos.php:1492 ../../mod/content.php:439
-#: ../../mod/content.php:724 ../../mod/settings.php:606
-#: ../../mod/group.php:168 ../../mod/admin.php:696
-#: ../../include/conversation.php:569 ../../object/Item.php:118
+#: ../../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
 msgid "Delete"
 msgstr "删除"
 
-#: ../../mod/photos.php:1605
+#: ../../mod/photos.php:1674
 msgid "View Album"
 msgstr "看照片册"
 
-#: ../../mod/photos.php:1614
+#: ../../mod/photos.php:1683
 msgid "Recent Photos"
 msgstr "最近的照片"
 
@@ -697,7 +697,7 @@ msgid "Community"
 msgstr "社会"
 
 #: ../../mod/community.php:61 ../../mod/community.php:86
-#: ../../mod/search.php:159 ../../mod/search.php:185
+#: ../../mod/search.php:162 ../../mod/search.php:188
 msgid "No results."
 msgstr "没有结果"
 
@@ -737,100 +737,100 @@ msgstr "没有安装的插件/应用"
 msgid "Item not found"
 msgstr "项目没找到"
 
-#: ../../mod/editpost.php:36
+#: ../../mod/editpost.php:39
 msgid "Edit post"
 msgstr "编辑文章"
 
-#: ../../mod/editpost.php:88 ../../include/conversation.php:952
+#: ../../mod/editpost.php:91 ../../include/conversation.php:991
 msgid "Post to Email"
 msgstr "电邮发布"
 
-#: ../../mod/editpost.php:103 ../../mod/content.php:711
-#: ../../mod/settings.php:605 ../../object/Item.php:108
+#: ../../mod/editpost.php:106 ../../mod/content.php:728
+#: ../../mod/settings.php:622 ../../object/Item.php:109
 msgid "Edit"
 msgstr "编辑"
 
-#: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150
-#: ../../mod/message.php:291 ../../mod/message.php:478
-#: ../../include/conversation.php:967
+#: ../../mod/editpost.php:107 ../../mod/wallmessage.php:150
+#: ../../mod/message.php:298 ../../mod/message.php:525
+#: ../../include/conversation.php:1006
 msgid "Upload photo"
 msgstr "上传照片"
 
-#: ../../mod/editpost.php:105 ../../include/conversation.php:968
+#: ../../mod/editpost.php:108 ../../include/conversation.php:1007
 msgid "upload photo"
 msgstr "上传照片"
 
-#: ../../mod/editpost.php:106 ../../include/conversation.php:969
+#: ../../mod/editpost.php:109 ../../include/conversation.php:1008
 msgid "Attach file"
 msgstr "附上文件"
 
-#: ../../mod/editpost.php:107 ../../include/conversation.php:970
+#: ../../mod/editpost.php:110 ../../include/conversation.php:1009
 msgid "attach file"
 msgstr "附上文件"
 
-#: ../../mod/editpost.php:108 ../../mod/wallmessage.php:151
-#: ../../mod/message.php:292 ../../mod/message.php:479
-#: ../../include/conversation.php:971
+#: ../../mod/editpost.php:111 ../../mod/wallmessage.php:151
+#: ../../mod/message.php:299 ../../mod/message.php:526
+#: ../../include/conversation.php:1010
 msgid "Insert web link"
 msgstr "插入网页环节"
 
-#: ../../mod/editpost.php:109 ../../include/conversation.php:972
+#: ../../mod/editpost.php:112 ../../include/conversation.php:1011
 msgid "web link"
 msgstr "网页环节"
 
-#: ../../mod/editpost.php:110 ../../include/conversation.php:973
+#: ../../mod/editpost.php:113 ../../include/conversation.php:1012
 msgid "Insert video link"
 msgstr "插入视频环节"
 
-#: ../../mod/editpost.php:111 ../../include/conversation.php:974
+#: ../../mod/editpost.php:114 ../../include/conversation.php:1013
 msgid "video link"
 msgstr "视频环节"
 
-#: ../../mod/editpost.php:112 ../../include/conversation.php:975
+#: ../../mod/editpost.php:115 ../../include/conversation.php:1014
 msgid "Insert audio link"
 msgstr "插入录音环节"
 
-#: ../../mod/editpost.php:113 ../../include/conversation.php:976
+#: ../../mod/editpost.php:116 ../../include/conversation.php:1015
 msgid "audio link"
 msgstr "录音环节"
 
-#: ../../mod/editpost.php:114 ../../include/conversation.php:977
+#: ../../mod/editpost.php:117 ../../include/conversation.php:1016
 msgid "Set your location"
 msgstr "设定您的位置"
 
-#: ../../mod/editpost.php:115 ../../include/conversation.php:978
+#: ../../mod/editpost.php:118 ../../include/conversation.php:1017
 msgid "set location"
 msgstr "指定位置"
 
-#: ../../mod/editpost.php:116 ../../include/conversation.php:979
+#: ../../mod/editpost.php:119 ../../include/conversation.php:1018
 msgid "Clear browser location"
 msgstr "清空浏览器位置"
 
-#: ../../mod/editpost.php:117 ../../include/conversation.php:980
+#: ../../mod/editpost.php:120 ../../include/conversation.php:1019
 msgid "clear location"
 msgstr "清理出位置"
 
-#: ../../mod/editpost.php:119 ../../include/conversation.php:986
+#: ../../mod/editpost.php:122 ../../include/conversation.php:1025
 msgid "Permission settings"
 msgstr "权设置"
 
-#: ../../mod/editpost.php:127 ../../include/conversation.php:995
+#: ../../mod/editpost.php:130 ../../include/conversation.php:1034
 msgid "CC: email addresses"
 msgstr "抄送: 电子邮件地址"
 
-#: ../../mod/editpost.php:128 ../../include/conversation.php:996
+#: ../../mod/editpost.php:131 ../../include/conversation.php:1035
 msgid "Public post"
 msgstr "公开的消息"
 
-#: ../../mod/editpost.php:131 ../../include/conversation.php:982
+#: ../../mod/editpost.php:134 ../../include/conversation.php:1021
 msgid "Set title"
 msgstr "指定标题"
 
-#: ../../mod/editpost.php:133 ../../include/conversation.php:984
+#: ../../mod/editpost.php:136 ../../include/conversation.php:1023
 msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: ../../mod/editpost.php:134 ../../include/conversation.php:998
+#: ../../mod/editpost.php:137 ../../include/conversation.php:1037
 msgid "Example: bob@example.com, mary@example.com"
 msgstr "比如: li@example.com, wang@example.com"
 
@@ -838,19 +838,19 @@ msgstr "比如: li@example.com, wang@example.com"
 msgid "This introduction has already been accepted."
 msgstr "这个介绍已经接受了。"
 
-#: ../../mod/dfrn_request.php:118 ../../mod/dfrn_request.php:512
+#: ../../mod/dfrn_request.php:118 ../../mod/dfrn_request.php:513
 msgid "Profile location is not valid or does not contain profile information."
 msgstr "简介位置失效或不包括简介信息。"
 
-#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:517
+#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:518
 msgid "Warning: profile location has no identifiable owner name."
 msgstr "警告:简介位置没有可设别的主名。"
 
-#: ../../mod/dfrn_request.php:125 ../../mod/dfrn_request.php:519
+#: ../../mod/dfrn_request.php:125 ../../mod/dfrn_request.php:520
 msgid "Warning: profile location has no profile photo."
 msgstr "警告:简介位置没有简介图。"
 
-#: ../../mod/dfrn_request.php:128 ../../mod/dfrn_request.php:522
+#: ../../mod/dfrn_request.php:128 ../../mod/dfrn_request.php:523
 #, php-format
 msgid "%d required parameter was not found at the given location"
 msgid_plural "%d required parameters were not found at the given location"
@@ -889,172 +889,172 @@ msgstr "无效找到物"
 msgid "Invalid email address."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:361
+#: ../../mod/dfrn_request.php:362
 msgid "This account has not been configured for email. Request failed."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:457
+#: ../../mod/dfrn_request.php:458
 msgid "Unable to resolve your name at the provided location."
 msgstr "不可疏解您的名字再输入的位置。"
 
-#: ../../mod/dfrn_request.php:470
+#: ../../mod/dfrn_request.php:471
 msgid "You have already introduced yourself here."
 msgstr "您已经自我介绍这儿。"
 
-#: ../../mod/dfrn_request.php:474
+#: ../../mod/dfrn_request.php:475
 #, php-format
 msgid "Apparently you are already friends with %s."
 msgstr "看上去您已经是%s的朋友。"
 
-#: ../../mod/dfrn_request.php:495
+#: ../../mod/dfrn_request.php:496
 msgid "Invalid profile URL."
 msgstr "无效的简介URL。"
 
-#: ../../mod/dfrn_request.php:501 ../../include/follow.php:27
+#: ../../mod/dfrn_request.php:502 ../../include/follow.php:27
 msgid "Disallowed profile URL."
 msgstr "不允许的简介地址."
 
-#: ../../mod/dfrn_request.php:570 ../../mod/contacts.php:123
+#: ../../mod/dfrn_request.php:571 ../../mod/contacts.php:124
 msgid "Failed to update contact record."
 msgstr "更新熟人记录失败了。"
 
-#: ../../mod/dfrn_request.php:591
+#: ../../mod/dfrn_request.php:592
 msgid "Your introduction has been sent."
 msgstr "您的介绍发布了。"
 
-#: ../../mod/dfrn_request.php:644
+#: ../../mod/dfrn_request.php:645
 msgid "Please login to confirm introduction."
 msgstr "请登记为确认介绍。"
 
-#: ../../mod/dfrn_request.php:658
+#: ../../mod/dfrn_request.php:659
 msgid ""
 "Incorrect identity currently logged in. Please login to "
 "<strong>this</strong> profile."
 msgstr "错误的用户登记者。请用<strong>这个</strong>用户。"
 
-#: ../../mod/dfrn_request.php:669
+#: ../../mod/dfrn_request.php:670
 msgid "Hide this contact"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:672
+#: ../../mod/dfrn_request.php:673
 #, php-format
 msgid "Welcome home %s."
 msgstr "欢迎%s。"
 
-#: ../../mod/dfrn_request.php:673
+#: ../../mod/dfrn_request.php:674
 #, php-format
 msgid "Please confirm your introduction/connection request to %s."
 msgstr "请确认您的介绍/联络要求给%s。"
 
-#: ../../mod/dfrn_request.php:674
+#: ../../mod/dfrn_request.php:675
 msgid "Confirm"
 msgstr "确认"
 
-#: ../../mod/dfrn_request.php:715 ../../include/items.php:3356
+#: ../../mod/dfrn_request.php:716 ../../include/items.php:3370
 msgid "[Name Withheld]"
 msgstr "[名字拒给]"
 
-#: ../../mod/dfrn_request.php:810
+#: ../../mod/dfrn_request.php:811
 msgid ""
 "Please enter your 'Identity Address' from one of the following supported "
 "communications networks:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:826
+#: ../../mod/dfrn_request.php:827
 msgid "<strike>Connect as an email follower</strike> (Coming soon)"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:828
+#: ../../mod/dfrn_request.php:829
 msgid ""
 "If you are not yet a member of the free social web, <a "
 "href=\"http://dir.friendica.com/siteinfo\">follow this link to find a public"
 " Friendica site and join us today</a>."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:831
+#: ../../mod/dfrn_request.php:832
 msgid "Friend/Connection Request"
 msgstr "朋友/联络要求。"
 
-#: ../../mod/dfrn_request.php:832
+#: ../../mod/dfrn_request.php:833
 msgid ""
 "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
 "testuser@identi.ca"
 msgstr "比如:jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"
 
-#: ../../mod/dfrn_request.php:833
+#: ../../mod/dfrn_request.php:834
 msgid "Please answer the following:"
 msgstr "请回答下述的:"
 
-#: ../../mod/dfrn_request.php:834
+#: ../../mod/dfrn_request.php:835
 #, php-format
 msgid "Does %s know you?"
 msgstr "%s是否认识你?"
 
-#: ../../mod/dfrn_request.php:837
+#: ../../mod/dfrn_request.php:838
 msgid "Add a personal note:"
 msgstr "添加个人的便条"
 
-#: ../../mod/dfrn_request.php:839 ../../include/contact_selectors.php:76
+#: ../../mod/dfrn_request.php:840 ../../include/contact_selectors.php:76
 msgid "Friendica"
 msgstr "Friendica"
 
-#: ../../mod/dfrn_request.php:840
+#: ../../mod/dfrn_request.php:841
 msgid "StatusNet/Federated Social Web"
 msgstr "StatusNet/联合社会化网"
 
-#: ../../mod/dfrn_request.php:841 ../../mod/settings.php:640
+#: ../../mod/dfrn_request.php:842 ../../mod/settings.php:681
 #: ../../include/contact_selectors.php:80
 msgid "Diaspora"
 msgstr "Diaspora"
 
-#: ../../mod/dfrn_request.php:842
+#: ../../mod/dfrn_request.php:843
 #, php-format
 msgid ""
 " - please do not use this form.  Instead, enter %s into your Diaspora search"
 " bar."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:843
+#: ../../mod/dfrn_request.php:844
 msgid "Your Identity Address:"
 msgstr "您的同一个人地址:"
 
-#: ../../mod/dfrn_request.php:846
+#: ../../mod/dfrn_request.php:847
 msgid "Submit Request"
 msgstr "提交要求"
 
-#: ../../mod/uexport.php:9 ../../mod/settings.php:30 ../../include/nav.php:137
+#: ../../mod/uexport.php:9 ../../mod/settings.php:30 ../../include/nav.php:140
 msgid "Account settings"
 msgstr "帐户配置"
 
-#: ../../mod/uexport.php:14 ../../mod/settings.php:35
+#: ../../mod/uexport.php:14 ../../mod/settings.php:40
 msgid "Display settings"
 msgstr ""
 
-#: ../../mod/uexport.php:20 ../../mod/settings.php:41
+#: ../../mod/uexport.php:20 ../../mod/settings.php:46
 msgid "Connector settings"
 msgstr "插销设置"
 
-#: ../../mod/uexport.php:25 ../../mod/settings.php:46
+#: ../../mod/uexport.php:25 ../../mod/settings.php:51
 msgid "Plugin settings"
 msgstr "插件设置"
 
-#: ../../mod/uexport.php:30 ../../mod/settings.php:51
+#: ../../mod/uexport.php:30 ../../mod/settings.php:56
 msgid "Connected apps"
 msgstr ""
 
-#: ../../mod/uexport.php:35 ../../mod/uexport.php:80 ../../mod/settings.php:56
+#: ../../mod/uexport.php:35 ../../mod/uexport.php:80 ../../mod/settings.php:61
 msgid "Export personal data"
 msgstr "出口私人信息"
 
-#: ../../mod/uexport.php:40 ../../mod/settings.php:61
+#: ../../mod/uexport.php:40 ../../mod/settings.php:66
 msgid "Remove account"
 msgstr ""
 
-#: ../../mod/uexport.php:48 ../../mod/settings.php:69
-#: ../../mod/newmember.php:22 ../../mod/admin.php:785 ../../mod/admin.php:990
+#: ../../mod/uexport.php:48 ../../mod/settings.php:74
+#: ../../mod/newmember.php:22 ../../mod/admin.php:824 ../../mod/admin.php:1029
 #: ../../addon/dav/friendica/layout.fnk.php:225
-#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:387
-#: ../../view/theme/diabook/theme.php:661 ../../include/nav.php:137
+#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:537
+#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:140
 #: ../../addon.old/dav/friendica/layout.fnk.php:225
 #: ../../addon.old/mathjax/mathjax.php:36
 msgid "Settings"
@@ -1081,262 +1081,291 @@ msgid ""
 "of your account (photos are not exported)"
 msgstr ""
 
-#: ../../mod/install.php:117
+#: ../../mod/install.php:121
 msgid "Friendica Social Communications Server - Setup"
 msgstr "Friendica社会交通服务器-安装"
 
-#: ../../mod/install.php:123
+#: ../../mod/install.php:127
 msgid "Could not connect to database."
 msgstr "解不了数据库。"
 
-#: ../../mod/install.php:127
+#: ../../mod/install.php:131
 msgid "Could not create table."
 msgstr "造成不了表格。"
 
-#: ../../mod/install.php:133
+#: ../../mod/install.php:137
 msgid "Your Friendica site database has been installed."
 msgstr "您Friendica网站数据库被安装了。"
 
-#: ../../mod/install.php:138
+#: ../../mod/install.php:142
 msgid ""
 "You may need to import the file \"database.sql\" manually using phpmyadmin "
 "or mysql."
 msgstr "您可能要手工地进口文件「database.sql」用phpmyadmin或mysql。"
 
-#: ../../mod/install.php:139 ../../mod/install.php:204
-#: ../../mod/install.php:488
+#: ../../mod/install.php:143 ../../mod/install.php:210
+#: ../../mod/install.php:510
 msgid "Please see the file \"INSTALL.txt\"."
 msgstr "请看文件「INSTALL.txt」"
 
-#: ../../mod/install.php:201
+#: ../../mod/install.php:207
 msgid "System check"
 msgstr "系统检测"
 
-#: ../../mod/install.php:206
+#: ../../mod/install.php:212
 msgid "Check again"
 msgstr "再检测"
 
-#: ../../mod/install.php:225
+#: ../../mod/install.php:231
 msgid "Database connection"
 msgstr "数据库接通"
 
-#: ../../mod/install.php:226
+#: ../../mod/install.php:232
 msgid ""
 "In order to install Friendica we need to know how to connect to your "
 "database."
 msgstr "为安装Friendica我们要知道怎么连接您的数据库。"
 
-#: ../../mod/install.php:227
+#: ../../mod/install.php:233
 msgid ""
 "Please contact your hosting provider or site administrator if you have "
 "questions about these settings."
 msgstr "你有关于这些设置有问题的话,请给互联网托管服务或者网页管理联系。"
 
-#: ../../mod/install.php:228
+#: ../../mod/install.php:234
 msgid ""
 "The database you specify below should already exist. If it does not, please "
 "create it before continuing."
 msgstr "您下边指定的数据库应该已经存在。如果还没有,请继续前造成。"
 
-#: ../../mod/install.php:232
+#: ../../mod/install.php:238
 msgid "Database Server Name"
 msgstr "数据库服务器名"
 
-#: ../../mod/install.php:233
+#: ../../mod/install.php:239
 msgid "Database Login Name"
 msgstr "数据库登录名"
 
-#: ../../mod/install.php:234
+#: ../../mod/install.php:240
 msgid "Database Login Password"
 msgstr "数据库登录密码"
 
-#: ../../mod/install.php:235
+#: ../../mod/install.php:241
 msgid "Database Name"
 msgstr "数据库名字"
 
-#: ../../mod/install.php:236 ../../mod/install.php:275
+#: ../../mod/install.php:242 ../../mod/install.php:281
 msgid "Site administrator email address"
 msgstr "网站行政人员邮件地址"
 
-#: ../../mod/install.php:236 ../../mod/install.php:275
+#: ../../mod/install.php:242 ../../mod/install.php:281
 msgid ""
 "Your account email address must match this in order to use the web admin "
 "panel."
 msgstr "您账户邮件地址必要符合这个为用网站处理仪表板"
 
-#: ../../mod/install.php:240 ../../mod/install.php:278
+#: ../../mod/install.php:246 ../../mod/install.php:284
 msgid "Please select a default timezone for your website"
 msgstr "请选择您网站的默认时区"
 
-#: ../../mod/install.php:265
+#: ../../mod/install.php:271
 msgid "Site settings"
 msgstr "网站设置"
 
-#: ../../mod/install.php:318
+#: ../../mod/install.php:324
 msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr "没找到命令行PHP在网服务器PATH。"
 
-#: ../../mod/install.php:319
+#: ../../mod/install.php:325
 msgid ""
 "If you don't have a command line version of PHP installed on server, you "
 "will not be able to run background polling via cron. See <a "
 "href='http://friendica.com/node/27'>'Activating scheduled tasks'</a>"
 msgstr ""
 
-#: ../../mod/install.php:323
+#: ../../mod/install.php:329
 msgid "PHP executable path"
 msgstr "PHP可执行路径"
 
-#: ../../mod/install.php:323
+#: ../../mod/install.php:329
 msgid ""
 "Enter full path to php executable. You can leave this blank to continue the "
 "installation."
 msgstr ""
 
-#: ../../mod/install.php:328
+#: ../../mod/install.php:334
 msgid "Command line PHP"
 msgstr "命令行PHP"
 
-#: ../../mod/install.php:337
+#: ../../mod/install.php:343
 msgid ""
 "The command line version of PHP on your system does not have "
 "\"register_argc_argv\" enabled."
 msgstr "您系统的命令行PHP没有能够「register_argc_argv」。"
 
-#: ../../mod/install.php:338
+#: ../../mod/install.php:344
 msgid "This is required for message delivery to work."
 msgstr "这必要为通信发布成功。"
 
-#: ../../mod/install.php:340
+#: ../../mod/install.php:346
 msgid "PHP register_argc_argv"
 msgstr ""
 
-#: ../../mod/install.php:361
+#: ../../mod/install.php:367
 msgid ""
 "Error: the \"openssl_pkey_new\" function on this system is not able to "
 "generate encryption keys"
 msgstr "错误:这系统的「register_argc_argv」子程序不能产生加密钥匙"
 
-#: ../../mod/install.php:362
+#: ../../mod/install.php:368
 msgid ""
 "If running under Windows, please see "
 "\"http://www.php.net/manual/en/openssl.installation.php\"."
 msgstr "如果您用Windows,请看「http://www.php.net/manual/en/openssl.installation.php」。"
 
-#: ../../mod/install.php:364
+#: ../../mod/install.php:370
 msgid "Generate encryption keys"
 msgstr "产生加密钥匙"
 
-#: ../../mod/install.php:371
+#: ../../mod/install.php:377
 msgid "libCurl PHP module"
 msgstr "libCurl PHP模块"
 
-#: ../../mod/install.php:372
+#: ../../mod/install.php:378
 msgid "GD graphics PHP module"
 msgstr "GD显示PHP模块"
 
-#: ../../mod/install.php:373
+#: ../../mod/install.php:379
 msgid "OpenSSL PHP module"
 msgstr "OpenSSL PHP模块"
 
-#: ../../mod/install.php:374
+#: ../../mod/install.php:380
 msgid "mysqli PHP module"
 msgstr "mysqli PHP模块"
 
-#: ../../mod/install.php:375
+#: ../../mod/install.php:381
 msgid "mb_string PHP module"
 msgstr "mb_string PHP模块"
 
-#: ../../mod/install.php:380 ../../mod/install.php:382
+#: ../../mod/install.php:386 ../../mod/install.php:388
 msgid "Apache mod_rewrite module"
 msgstr ""
 
-#: ../../mod/install.php:380
+#: ../../mod/install.php:386
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr "错误:Apache服务器的mod-rewrite模块是必要的可却不安装的。"
 
-#: ../../mod/install.php:388
+#: ../../mod/install.php:394
 msgid "Error: libCURL PHP module required but not installed."
 msgstr "错误:libCurl PHP模块是必要的可却不安装的。"
 
-#: ../../mod/install.php:392
+#: ../../mod/install.php:398
 msgid ""
 "Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr "错误:GD显示PHP模块跟JPEG支持是必要的可却安装的。"
 
-#: ../../mod/install.php:396
+#: ../../mod/install.php:402
 msgid "Error: openssl PHP module required but not installed."
 msgstr "错误:openssl PHP模块是必要的可却不安装的。"
 
-#: ../../mod/install.php:400
+#: ../../mod/install.php:406
 msgid "Error: mysqli PHP module required but not installed."
 msgstr "错误:mysqli PHP模块是必要的可却不安装的。"
 
-#: ../../mod/install.php:404
+#: ../../mod/install.php:410
 msgid "Error: mb_string PHP module required but not installed."
 msgstr "错误:mbstring PHP模块必要可没安装的。"
 
-#: ../../mod/install.php:421
+#: ../../mod/install.php:427
 msgid ""
 "The web installer needs to be able to create a file called \".htconfig.php\""
 " in the top folder of your web server and it is unable to do so."
 msgstr "网页安装者要能造成叫「.htconfig.php」在网服务器主文件夹可却不能。"
 
-#: ../../mod/install.php:422
+#: ../../mod/install.php:428
 msgid ""
 "This is most often a permission setting, as the web server may not be able "
 "to write files in your folder - even if you can."
 msgstr "这常常是一个权设置,因为网服务器可能不会写文件在文件夹-即使您会。"
 
-#: ../../mod/install.php:423
+#: ../../mod/install.php:429
 msgid ""
 "At the end of this procedure, we will give you a text to save in a file "
 "named .htconfig.php in your Friendica top folder."
 msgstr ""
 
-#: ../../mod/install.php:424
+#: ../../mod/install.php:430
 msgid ""
 "You can alternatively skip this procedure and perform a manual installation."
 " Please see the file \"INSTALL.txt\" for instructions."
 msgstr ""
 
-#: ../../mod/install.php:427
+#: ../../mod/install.php:433
 msgid ".htconfig.php is writable"
 msgstr ".htconfig.php是可写的"
 
-#: ../../mod/install.php:439
+#: ../../mod/install.php:443
+msgid ""
+"Friendica uses the Smarty3 template engine to render its web views. Smarty3 "
+"compiles templates to PHP to speed up rendering."
+msgstr ""
+
+#: ../../mod/install.php:444
+msgid ""
+"In order to store these compiled templates, the web server needs to have "
+"write access to the directory view/smarty3/ under the Friendica top level "
+"folder."
+msgstr ""
+
+#: ../../mod/install.php:445
+msgid ""
+"Please ensure that the user that your web server runs as (e.g. www-data) has"
+" write access to this folder."
+msgstr ""
+
+#: ../../mod/install.php:446
+msgid ""
+"Note: as a security measure, you should give the web server write access to "
+"view/smarty3/ only--not the template files (.tpl) that it contains."
+msgstr ""
+
+#: ../../mod/install.php:449
+msgid "view/smarty3 is writable"
+msgstr ""
+
+#: ../../mod/install.php:461
 msgid ""
 "Url rewrite in .htaccess is not working. Check your server configuration."
 msgstr ""
 
-#: ../../mod/install.php:441
+#: ../../mod/install.php:463
 msgid "Url rewrite is working"
 msgstr ""
 
-#: ../../mod/install.php:451
+#: ../../mod/install.php:473
 msgid ""
 "The database configuration file \".htconfig.php\" could not be written. "
 "Please use the enclosed text to create a configuration file in your web "
 "server root."
 msgstr "数据库设置文件「.htconfig.php」不能被写。请把包括的正文造成设置文件在网服务器子目录。"
 
-#: ../../mod/install.php:475
+#: ../../mod/install.php:497
 msgid "Errors encountered creating database tables."
 msgstr "造成数据库列表相遇错误。"
 
-#: ../../mod/install.php:486
+#: ../../mod/install.php:508
 msgid "<h1>What next</h1>"
 msgstr ""
 
-#: ../../mod/install.php:487
+#: ../../mod/install.php:509
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the "
 "poller."
 msgstr "重要:您要[手工地]准备安排的任务给喂器。"
 
 #: ../../mod/localtime.php:12 ../../include/event.php:11
-#: ../../include/bb2diaspora.php:390
+#: ../../include/bb2diaspora.php:393
 msgid "l F d, Y \\@ g:i A"
 msgstr "l F d, Y \\@ g:i A"
 
@@ -1402,7 +1431,7 @@ msgid "is interested in:"
 msgstr "感兴趣对:"
 
 #: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:1214
+#: ../../include/contact_widgets.php:9 ../../boot.php:1264
 msgid "Connect"
 msgstr "连接"
 
@@ -1415,149 +1444,149 @@ msgid "Remote privacy information not available."
 msgstr "摇隐私信息无效"
 
 #: ../../mod/lockview.php:48
-#: ../../addon/remote_permissions/remote_permissions.php:123
+#: ../../addon/remote_permissions/remote_permissions.php:124
 msgid "Visible to:"
 msgstr "可见给:"
 
-#: ../../mod/content.php:119 ../../mod/network.php:544
+#: ../../mod/content.php:119 ../../mod/network.php:594
 msgid "No such group"
 msgstr "没有这个组"
 
-#: ../../mod/content.php:130 ../../mod/network.php:555
+#: ../../mod/content.php:130 ../../mod/network.php:605
 msgid "Group is empty"
 msgstr "组没有成员"
 
-#: ../../mod/content.php:134 ../../mod/network.php:559
+#: ../../mod/content.php:134 ../../mod/network.php:609
 msgid "Group: "
 msgstr "组:"
 
-#: ../../mod/content.php:438 ../../mod/content.php:723
-#: ../../include/conversation.php:568 ../../object/Item.php:117
+#: ../../mod/content.php:438 ../../mod/content.php:740
+#: ../../include/conversation.php:568 ../../object/Item.php:118
 msgid "Select"
 msgstr "选择"
 
-#: ../../mod/content.php:455 ../../mod/content.php:817
-#: ../../mod/content.php:818 ../../include/conversation.php:587
-#: ../../object/Item.php:229 ../../object/Item.php:230
+#: ../../mod/content.php:472 ../../mod/content.php:852
+#: ../../mod/content.php:853 ../../include/conversation.php:608
+#: ../../object/Item.php:257 ../../object/Item.php:258
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr "看%s的简介@ %s"
 
-#: ../../mod/content.php:465 ../../mod/content.php:829
-#: ../../include/conversation.php:607 ../../object/Item.php:243
+#: ../../mod/content.php:482 ../../mod/content.php:864
+#: ../../include/conversation.php:628 ../../object/Item.php:271
 #, php-format
 msgid "%s from %s"
 msgstr "%s从%s"
 
-#: ../../mod/content.php:480 ../../include/conversation.php:622
+#: ../../mod/content.php:497 ../../include/conversation.php:643
 msgid "View in context"
 msgstr "看在上下文"
 
-#: ../../mod/content.php:586 ../../object/Item.php:282
+#: ../../mod/content.php:603 ../../object/Item.php:312
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] "%d评论"
 
-#: ../../mod/content.php:588 ../../include/text.php:1446
-#: ../../object/Item.php:284 ../../object/Item.php:297
+#: ../../mod/content.php:605 ../../include/text.php:1503
+#: ../../object/Item.php:314 ../../object/Item.php:327
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] ""
 
-#: ../../mod/content.php:589 ../../addon/page/page.php:77
+#: ../../mod/content.php:606 ../../addon/page/page.php:77
 #: ../../addon/page/page.php:111 ../../addon/showmore/showmore.php:119
-#: ../../include/contact_widgets.php:195 ../../boot.php:607
-#: ../../object/Item.php:285 ../../addon.old/page/page.php:77
+#: ../../include/contact_widgets.php:204 ../../boot.php:636
+#: ../../object/Item.php:315 ../../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:667 ../../object/Item.php:197
+#: ../../mod/content.php:684 ../../object/Item.php:203
 msgid "like"
 msgstr "喜欢"
 
-#: ../../mod/content.php:668 ../../object/Item.php:198
+#: ../../mod/content.php:685 ../../object/Item.php:204
 msgid "dislike"
 msgstr "讨厌"
 
-#: ../../mod/content.php:670 ../../object/Item.php:200
+#: ../../mod/content.php:687 ../../object/Item.php:206
 msgid "Share this"
 msgstr "分享这个"
 
-#: ../../mod/content.php:670 ../../object/Item.php:200
+#: ../../mod/content.php:687 ../../object/Item.php:206
 msgid "share"
 msgstr "分享"
 
-#: ../../mod/content.php:694 ../../object/Item.php:565
+#: ../../mod/content.php:711 ../../object/Item.php:610
 msgid "Bold"
 msgstr ""
 
-#: ../../mod/content.php:695 ../../object/Item.php:566
+#: ../../mod/content.php:712 ../../object/Item.php:611
 msgid "Italic"
 msgstr ""
 
-#: ../../mod/content.php:696 ../../object/Item.php:567
+#: ../../mod/content.php:713 ../../object/Item.php:612
 msgid "Underline"
 msgstr ""
 
-#: ../../mod/content.php:697 ../../object/Item.php:568
+#: ../../mod/content.php:714 ../../object/Item.php:613
 msgid "Quote"
 msgstr ""
 
-#: ../../mod/content.php:698 ../../object/Item.php:569
+#: ../../mod/content.php:715 ../../object/Item.php:614
 msgid "Code"
 msgstr ""
 
-#: ../../mod/content.php:699 ../../object/Item.php:570
+#: ../../mod/content.php:716 ../../object/Item.php:615
 msgid "Image"
 msgstr ""
 
-#: ../../mod/content.php:700 ../../object/Item.php:571
+#: ../../mod/content.php:717 ../../object/Item.php:616
 msgid "Link"
 msgstr ""
 
-#: ../../mod/content.php:701 ../../object/Item.php:572
+#: ../../mod/content.php:718 ../../object/Item.php:617
 msgid "Video"
 msgstr ""
 
-#: ../../mod/content.php:736 ../../object/Item.php:181
+#: ../../mod/content.php:753 ../../object/Item.php:182
 msgid "add star"
 msgstr "加星"
 
-#: ../../mod/content.php:737 ../../object/Item.php:182
+#: ../../mod/content.php:754 ../../object/Item.php:183
 msgid "remove star"
 msgstr "消星"
 
-#: ../../mod/content.php:738 ../../object/Item.php:183
+#: ../../mod/content.php:755 ../../object/Item.php:184
 msgid "toggle star status"
 msgstr "转变星现状"
 
-#: ../../mod/content.php:741 ../../object/Item.php:186
+#: ../../mod/content.php:758 ../../object/Item.php:187
 msgid "starred"
 msgstr "被贴星"
 
-#: ../../mod/content.php:742 ../../object/Item.php:187
+#: ../../mod/content.php:759 ../../object/Item.php:192
 msgid "add tag"
 msgstr "加标签"
 
-#: ../../mod/content.php:746 ../../object/Item.php:121
+#: ../../mod/content.php:763 ../../object/Item.php:122
 msgid "save to folder"
 msgstr ""
 
-#: ../../mod/content.php:819 ../../object/Item.php:231
+#: ../../mod/content.php:854 ../../object/Item.php:259
 msgid "to"
 msgstr "至"
 
-#: ../../mod/content.php:820 ../../object/Item.php:233
+#: ../../mod/content.php:855 ../../object/Item.php:261
 msgid "Wall-to-Wall"
 msgstr "从墙到墙"
 
-#: ../../mod/content.php:821 ../../object/Item.php:234
+#: ../../mod/content.php:856 ../../object/Item.php:262
 msgid "via Wall-To-Wall:"
 msgstr "通过从墙到墙"
 
-#: ../../mod/home.php:30 ../../addon/communityhome/communityhome.php:179
+#: ../../mod/home.php:34 ../../addon/communityhome/communityhome.php:189
 #: ../../addon.old/communityhome/communityhome.php:179
 #, php-format
 msgid "Welcome to %s"
@@ -1567,14 +1596,14 @@ msgstr "%s欢迎你"
 msgid "Invalid request identifier."
 msgstr "无效要求身份号。"
 
-#: ../../mod/notifications.php:35 ../../mod/notifications.php:164
-#: ../../mod/notifications.php:210
+#: ../../mod/notifications.php:35 ../../mod/notifications.php:165
+#: ../../mod/notifications.php:211
 msgid "Discard"
 msgstr "丢弃"
 
-#: ../../mod/notifications.php:51 ../../mod/notifications.php:163
-#: ../../mod/notifications.php:209 ../../mod/contacts.php:324
-#: ../../mod/contacts.php:378
+#: ../../mod/notifications.php:51 ../../mod/notifications.php:164
+#: ../../mod/notifications.php:210 ../../mod/contacts.php:325
+#: ../../mod/contacts.php:379
 msgid "Ignore"
 msgstr "忽视"
 
@@ -1586,21 +1615,21 @@ msgstr "系统"
 msgid "Network"
 msgstr "网络"
 
-#: ../../mod/notifications.php:88 ../../mod/network.php:407
+#: ../../mod/notifications.php:88 ../../mod/network.php:444
 msgid "Personal"
 msgstr "私人"
 
 #: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:87
-#: ../../include/nav.php:77 ../../include/nav.php:115
+#: ../../include/nav.php:77 ../../include/nav.php:116
 msgid "Home"
 msgstr "主页"
 
-#: ../../mod/notifications.php:98 ../../include/nav.php:121
+#: ../../mod/notifications.php:98 ../../include/nav.php:122
 msgid "Introductions"
 msgstr "介绍"
 
-#: ../../mod/notifications.php:103 ../../mod/message.php:176
-#: ../../include/nav.php:128
+#: ../../mod/notifications.php:103 ../../mod/message.php:180
+#: ../../include/nav.php:129
 msgid "Messages"
 msgstr "消息"
 
@@ -1612,587 +1641,587 @@ msgstr "显示不理的要求"
 msgid "Hide Ignored Requests"
 msgstr "隐藏不理的要求"
 
-#: ../../mod/notifications.php:148 ../../mod/notifications.php:194
+#: ../../mod/notifications.php:149 ../../mod/notifications.php:195
 msgid "Notification type: "
 msgstr "通知种类:"
 
-#: ../../mod/notifications.php:149
+#: ../../mod/notifications.php:150
 msgid "Friend Suggestion"
 msgstr "朋友建议"
 
-#: ../../mod/notifications.php:151
+#: ../../mod/notifications.php:152
 #, php-format
 msgid "suggested by %s"
 msgstr "由%s建议的"
 
-#: ../../mod/notifications.php:156 ../../mod/notifications.php:203
-#: ../../mod/contacts.php:384
+#: ../../mod/notifications.php:157 ../../mod/notifications.php:204
+#: ../../mod/contacts.php:385
 msgid "Hide this contact from others"
 msgstr "隐藏这个熟人给别人"
 
-#: ../../mod/notifications.php:157 ../../mod/notifications.php:204
+#: ../../mod/notifications.php:158 ../../mod/notifications.php:205
 msgid "Post a new friend activity"
-msgstr ""
+msgstr "表新朋友活动"
 
-#: ../../mod/notifications.php:157 ../../mod/notifications.php:204
+#: ../../mod/notifications.php:158 ../../mod/notifications.php:205
 msgid "if applicable"
-msgstr ""
+msgstr "或适用"
 
-#: ../../mod/notifications.php:160 ../../mod/notifications.php:207
-#: ../../mod/admin.php:694
+#: ../../mod/notifications.php:161 ../../mod/notifications.php:208
+#: ../../mod/admin.php:733
 msgid "Approve"
 msgstr "批准"
 
-#: ../../mod/notifications.php:180
+#: ../../mod/notifications.php:181
 msgid "Claims to be known to you: "
 msgstr "声称被您认识:"
 
-#: ../../mod/notifications.php:180
+#: ../../mod/notifications.php:181
 msgid "yes"
 msgstr "是"
 
-#: ../../mod/notifications.php:180
+#: ../../mod/notifications.php:181
 msgid "no"
 msgstr "否"
 
-#: ../../mod/notifications.php:187
+#: ../../mod/notifications.php:188
 msgid "Approve as: "
 msgstr "批准作为"
 
-#: ../../mod/notifications.php:188
+#: ../../mod/notifications.php:189
 msgid "Friend"
 msgstr "朋友"
 
-#: ../../mod/notifications.php:189
+#: ../../mod/notifications.php:190
 msgid "Sharer"
 msgstr "分享者"
 
-#: ../../mod/notifications.php:189
+#: ../../mod/notifications.php:190
 msgid "Fan/Admirer"
 msgstr "迷/赞赏者"
 
-#: ../../mod/notifications.php:195
+#: ../../mod/notifications.php:196
 msgid "Friend/Connect Request"
 msgstr "友谊/联络要求"
 
-#: ../../mod/notifications.php:195
+#: ../../mod/notifications.php:196
 msgid "New Follower"
 msgstr "新关注者:"
 
-#: ../../mod/notifications.php:216
+#: ../../mod/notifications.php:217
 msgid "No introductions."
 msgstr "没有介绍。"
 
-#: ../../mod/notifications.php:219 ../../include/nav.php:122
+#: ../../mod/notifications.php:220 ../../include/nav.php:123
 msgid "Notifications"
 msgstr "通知"
 
-#: ../../mod/notifications.php:256 ../../mod/notifications.php:381
-#: ../../mod/notifications.php:468
+#: ../../mod/notifications.php:257 ../../mod/notifications.php:382
+#: ../../mod/notifications.php:469
 #, php-format
 msgid "%s liked %s's post"
 msgstr "%s喜欢了%s的消息"
 
-#: ../../mod/notifications.php:265 ../../mod/notifications.php:390
-#: ../../mod/notifications.php:477
+#: ../../mod/notifications.php:266 ../../mod/notifications.php:391
+#: ../../mod/notifications.php:478
 #, php-format
 msgid "%s disliked %s's post"
 msgstr "%s不喜欢了%s的消息"
 
-#: ../../mod/notifications.php:279 ../../mod/notifications.php:404
-#: ../../mod/notifications.php:491
+#: ../../mod/notifications.php:280 ../../mod/notifications.php:405
+#: ../../mod/notifications.php:492
 #, php-format
 msgid "%s is now friends with %s"
 msgstr "%s成为%s的朋友"
 
-#: ../../mod/notifications.php:286 ../../mod/notifications.php:411
+#: ../../mod/notifications.php:287 ../../mod/notifications.php:412
 #, php-format
 msgid "%s created a new post"
 msgstr "%s造成新文章"
 
-#: ../../mod/notifications.php:287 ../../mod/notifications.php:412
-#: ../../mod/notifications.php:500
+#: ../../mod/notifications.php:288 ../../mod/notifications.php:413
+#: ../../mod/notifications.php:501
 #, php-format
 msgid "%s commented on %s's post"
 msgstr "%s便条%s的文章"
 
-#: ../../mod/notifications.php:301
+#: ../../mod/notifications.php:302
 msgid "No more network notifications."
 msgstr "没有别的网络通信。"
 
-#: ../../mod/notifications.php:305
+#: ../../mod/notifications.php:306
 msgid "Network Notifications"
 msgstr ""
 
-#: ../../mod/notifications.php:331 ../../mod/notify.php:61
+#: ../../mod/notifications.php:332 ../../mod/notify.php:61
 msgid "No more system notifications."
 msgstr ""
 
-#: ../../mod/notifications.php:335 ../../mod/notify.php:65
+#: ../../mod/notifications.php:336 ../../mod/notify.php:65
 msgid "System Notifications"
 msgstr ""
 
-#: ../../mod/notifications.php:426
+#: ../../mod/notifications.php:427
 msgid "No more personal notifications."
 msgstr "没有别的私人通信。"
 
-#: ../../mod/notifications.php:430
+#: ../../mod/notifications.php:431
 msgid "Personal Notifications"
 msgstr ""
 
-#: ../../mod/notifications.php:507
+#: ../../mod/notifications.php:508
 msgid "No more home notifications."
 msgstr "没有别的家通信。"
 
-#: ../../mod/notifications.php:511
+#: ../../mod/notifications.php:512
 msgid "Home Notifications"
 msgstr ""
 
-#: ../../mod/contacts.php:84 ../../mod/contacts.php:164
+#: ../../mod/contacts.php:85 ../../mod/contacts.php:165
 msgid "Could not access contact record."
 msgstr "用不了熟人记录。"
 
-#: ../../mod/contacts.php:98
+#: ../../mod/contacts.php:99
 msgid "Could not locate selected profile."
 msgstr "找不到选择的简介。"
 
-#: ../../mod/contacts.php:121
+#: ../../mod/contacts.php:122
 msgid "Contact updated."
 msgstr "熟人更新了。"
 
-#: ../../mod/contacts.php:186
+#: ../../mod/contacts.php:187
 msgid "Contact has been blocked"
 msgstr "熟人拦了"
 
-#: ../../mod/contacts.php:186
+#: ../../mod/contacts.php:187
 msgid "Contact has been unblocked"
 msgstr "熟人否拦了"
 
-#: ../../mod/contacts.php:200
+#: ../../mod/contacts.php:201
 msgid "Contact has been ignored"
 msgstr "熟人不理了"
 
-#: ../../mod/contacts.php:200
+#: ../../mod/contacts.php:201
 msgid "Contact has been unignored"
 msgstr "熟人否不理了"
 
-#: ../../mod/contacts.php:219
+#: ../../mod/contacts.php:220
 msgid "Contact has been archived"
 msgstr ""
 
-#: ../../mod/contacts.php:219
+#: ../../mod/contacts.php:220
 msgid "Contact has been unarchived"
 msgstr ""
 
-#: ../../mod/contacts.php:232
+#: ../../mod/contacts.php:233
 msgid "Contact has been removed."
 msgstr "熟人删除了。"
 
-#: ../../mod/contacts.php:266
+#: ../../mod/contacts.php:267
 #, php-format
 msgid "You are mutual friends with %s"
 msgstr "您和%s是共同朋友们"
 
-#: ../../mod/contacts.php:270
+#: ../../mod/contacts.php:271
 #, php-format
 msgid "You are sharing with %s"
 msgstr "您分享给%s"
 
-#: ../../mod/contacts.php:275
+#: ../../mod/contacts.php:276
 #, php-format
 msgid "%s is sharing with you"
 msgstr "%s给您分享"
 
-#: ../../mod/contacts.php:292
+#: ../../mod/contacts.php:293
 msgid "Private communications are not available for this contact."
 msgstr "没有私人的沟通跟这个熟人"
 
-#: ../../mod/contacts.php:295
+#: ../../mod/contacts.php:296
 msgid "Never"
 msgstr "从未"
 
-#: ../../mod/contacts.php:299
+#: ../../mod/contacts.php:300
 msgid "(Update was successful)"
 msgstr "(更新成功)"
 
-#: ../../mod/contacts.php:299
+#: ../../mod/contacts.php:300
 msgid "(Update was not successful)"
 msgstr "(更新不成功)"
 
-#: ../../mod/contacts.php:301
+#: ../../mod/contacts.php:302
 msgid "Suggest friends"
 msgstr "建议朋友们"
 
-#: ../../mod/contacts.php:305
+#: ../../mod/contacts.php:306
 #, php-format
 msgid "Network type: %s"
 msgstr "网络种类: %s"
 
-#: ../../mod/contacts.php:308 ../../include/contact_widgets.php:190
+#: ../../mod/contacts.php:309 ../../include/contact_widgets.php:199
 #, php-format
 msgid "%d contact in common"
 msgid_plural "%d contacts in common"
 msgstr[0] "%d共同熟人"
 
-#: ../../mod/contacts.php:313
+#: ../../mod/contacts.php:314
 msgid "View all contacts"
 msgstr "看所有的熟人"
 
-#: ../../mod/contacts.php:318 ../../mod/contacts.php:377
-#: ../../mod/admin.php:698
+#: ../../mod/contacts.php:319 ../../mod/contacts.php:378
+#: ../../mod/admin.php:737
 msgid "Unblock"
 msgstr "不拦"
 
-#: ../../mod/contacts.php:318 ../../mod/contacts.php:377
-#: ../../mod/admin.php:697
+#: ../../mod/contacts.php:319 ../../mod/contacts.php:378
+#: ../../mod/admin.php:736
 msgid "Block"
 msgstr "拦"
 
-#: ../../mod/contacts.php:321
+#: ../../mod/contacts.php:322
 msgid "Toggle Blocked status"
-msgstr ""
+msgstr "交替拦配置"
 
-#: ../../mod/contacts.php:324 ../../mod/contacts.php:378
+#: ../../mod/contacts.php:325 ../../mod/contacts.php:379
 msgid "Unignore"
 msgstr "停不理"
 
-#: ../../mod/contacts.php:327
+#: ../../mod/contacts.php:328
 msgid "Toggle Ignored status"
 msgstr ""
 
-#: ../../mod/contacts.php:331
+#: ../../mod/contacts.php:332
 msgid "Unarchive"
 msgstr ""
 
-#: ../../mod/contacts.php:331
+#: ../../mod/contacts.php:332
 msgid "Archive"
 msgstr ""
 
-#: ../../mod/contacts.php:334
+#: ../../mod/contacts.php:335
 msgid "Toggle Archive status"
 msgstr ""
 
-#: ../../mod/contacts.php:337
+#: ../../mod/contacts.php:338
 msgid "Repair"
 msgstr "维修"
 
-#: ../../mod/contacts.php:340
+#: ../../mod/contacts.php:341
 msgid "Advanced Contact Settings"
 msgstr ""
 
-#: ../../mod/contacts.php:346
+#: ../../mod/contacts.php:347
 msgid "Communications lost with this contact!"
 msgstr ""
 
-#: ../../mod/contacts.php:349
+#: ../../mod/contacts.php:350
 msgid "Contact Editor"
 msgstr "熟人编器"
 
-#: ../../mod/contacts.php:352
+#: ../../mod/contacts.php:353
 msgid "Profile Visibility"
 msgstr "简历可见量"
 
-#: ../../mod/contacts.php:353
+#: ../../mod/contacts.php:354
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr "请选择简介您想给%s显示他安全地看您的简介的时候。"
 
-#: ../../mod/contacts.php:354
+#: ../../mod/contacts.php:355
 msgid "Contact Information / Notes"
 msgstr "熟人信息/便条"
 
-#: ../../mod/contacts.php:355
+#: ../../mod/contacts.php:356
 msgid "Edit contact notes"
 msgstr "编辑熟人便条"
 
-#: ../../mod/contacts.php:360 ../../mod/contacts.php:552
+#: ../../mod/contacts.php:361 ../../mod/contacts.php:553
 #: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr "看%s的简介[%s]"
 
-#: ../../mod/contacts.php:361
+#: ../../mod/contacts.php:362
 msgid "Block/Unblock contact"
 msgstr "拦/否拦熟人"
 
-#: ../../mod/contacts.php:362
+#: ../../mod/contacts.php:363
 msgid "Ignore contact"
 msgstr "忽视熟人"
 
-#: ../../mod/contacts.php:363
+#: ../../mod/contacts.php:364
 msgid "Repair URL settings"
 msgstr "维修URL设置"
 
-#: ../../mod/contacts.php:364
+#: ../../mod/contacts.php:365
 msgid "View conversations"
 msgstr "看交流"
 
-#: ../../mod/contacts.php:366
+#: ../../mod/contacts.php:367
 msgid "Delete contact"
 msgstr "删除熟人"
 
-#: ../../mod/contacts.php:370
+#: ../../mod/contacts.php:371
 msgid "Last update:"
 msgstr "上个更新:"
 
-#: ../../mod/contacts.php:372
+#: ../../mod/contacts.php:373
 msgid "Update public posts"
 msgstr "更新公开文章"
 
-#: ../../mod/contacts.php:374 ../../mod/admin.php:1170
+#: ../../mod/contacts.php:375 ../../mod/admin.php:1209
 msgid "Update now"
 msgstr "现在更新"
 
-#: ../../mod/contacts.php:381
+#: ../../mod/contacts.php:382
 msgid "Currently blocked"
 msgstr "现在拦的"
 
-#: ../../mod/contacts.php:382
+#: ../../mod/contacts.php:383
 msgid "Currently ignored"
 msgstr "现在不理的"
 
-#: ../../mod/contacts.php:383
+#: ../../mod/contacts.php:384
 msgid "Currently archived"
 msgstr ""
 
-#: ../../mod/contacts.php:384
+#: ../../mod/contacts.php:385
 msgid ""
 "Replies/likes to your public posts <strong>may</strong> still be visible"
 msgstr "回答/喜欢关您公开文章<strong>会</strong>还可见的"
 
-#: ../../mod/contacts.php:437
+#: ../../mod/contacts.php:438
 msgid "Suggestions"
 msgstr ""
 
-#: ../../mod/contacts.php:440
+#: ../../mod/contacts.php:441
 msgid "Suggest potential friends"
 msgstr ""
 
-#: ../../mod/contacts.php:443 ../../mod/group.php:191
+#: ../../mod/contacts.php:444 ../../mod/group.php:194
 msgid "All Contacts"
 msgstr "所有的熟人"
 
-#: ../../mod/contacts.php:446
+#: ../../mod/contacts.php:447
 msgid "Show all contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:449
+#: ../../mod/contacts.php:450
 msgid "Unblocked"
 msgstr ""
 
-#: ../../mod/contacts.php:452
+#: ../../mod/contacts.php:453
 msgid "Only show unblocked contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:456
+#: ../../mod/contacts.php:457
 msgid "Blocked"
 msgstr ""
 
-#: ../../mod/contacts.php:459
+#: ../../mod/contacts.php:460
 msgid "Only show blocked contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:463
+#: ../../mod/contacts.php:464
 msgid "Ignored"
 msgstr ""
 
-#: ../../mod/contacts.php:466
+#: ../../mod/contacts.php:467
 msgid "Only show ignored contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:470
+#: ../../mod/contacts.php:471
 msgid "Archived"
 msgstr ""
 
-#: ../../mod/contacts.php:473
+#: ../../mod/contacts.php:474
 msgid "Only show archived contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:477
+#: ../../mod/contacts.php:478
 msgid "Hidden"
 msgstr ""
 
-#: ../../mod/contacts.php:480
+#: ../../mod/contacts.php:481
 msgid "Only show hidden contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:528
+#: ../../mod/contacts.php:529
 msgid "Mutual Friendship"
 msgstr "共同友谊"
 
-#: ../../mod/contacts.php:532
+#: ../../mod/contacts.php:533
 msgid "is a fan of yours"
 msgstr "是您迷"
 
-#: ../../mod/contacts.php:536
+#: ../../mod/contacts.php:537
 msgid "you are a fan of"
 msgstr "你喜欢"
 
-#: ../../mod/contacts.php:553 ../../mod/nogroup.php:41
+#: ../../mod/contacts.php:554 ../../mod/nogroup.php:41
 msgid "Edit contact"
 msgstr "编熟人"
 
-#: ../../mod/contacts.php:574 ../../view/theme/diabook/theme.php:89
-#: ../../include/nav.php:139
+#: ../../mod/contacts.php:575 ../../view/theme/diabook/theme.php:89
+#: ../../include/nav.php:144
 msgid "Contacts"
 msgstr "熟人"
 
-#: ../../mod/contacts.php:578
+#: ../../mod/contacts.php:579
 msgid "Search your contacts"
 msgstr "搜索您的熟人"
 
-#: ../../mod/contacts.php:579 ../../mod/directory.php:59
+#: ../../mod/contacts.php:580 ../../mod/directory.php:59
+#: ../../addon/forumdirectory/forumdirectory.php:81
 msgid "Finding: "
 msgstr "找着:"
 
-#: ../../mod/contacts.php:580 ../../mod/directory.php:61
+#: ../../mod/contacts.php:581 ../../mod/directory.php:61
+#: ../../addon/forumdirectory/forumdirectory.php:83
 #: ../../include/contact_widgets.php:33
 msgid "Find"
 msgstr "搜索"
 
-#: ../../mod/lostpass.php:16
+#: ../../mod/lostpass.php:17
 msgid "No valid account found."
 msgstr "找不到效的账户。"
 
-#: ../../mod/lostpass.php:32
+#: ../../mod/lostpass.php:33
 msgid "Password reset request issued. Check your email."
 msgstr "重设密码要求发布了。核对您的收件箱。"
 
-#: ../../mod/lostpass.php:43
+#: ../../mod/lostpass.php:49
 #, php-format
 msgid "Password reset requested at %s"
 msgstr "重设密码要求被发布%s"
 
-#: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107
-#: ../../mod/register.php:91 ../../mod/register.php:145
-#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752
-#: ../../addon/facebook/facebook.php:702
-#: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661
-#: ../../addon/public_server/public_server.php:62
-#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3365
-#: ../../boot.php:822 ../../addon.old/facebook/facebook.php:702
-#: ../../addon.old/facebook/facebook.php:1200
-#: ../../addon.old/fbpost/fbpost.php:661
-#: ../../addon.old/public_server/public_server.php:62
-#: ../../addon.old/testdrive/testdrive.php:67
-msgid "Administrator"
-msgstr "管理员"
-
-#: ../../mod/lostpass.php:65
+#: ../../mod/lostpass.php:71
 msgid ""
 "Request could not be verified. (You may have previously submitted it.) "
 "Password reset failed."
 msgstr "要求确认不了。(您可能已经提交它。)重设密码失败了。"
 
-#: ../../mod/lostpass.php:83 ../../boot.php:961
+#: ../../mod/lostpass.php:89 ../../boot.php:998
 msgid "Password Reset"
 msgstr "复位密码"
 
-#: ../../mod/lostpass.php:84
+#: ../../mod/lostpass.php:90
 msgid "Your password has been reset as requested."
 msgstr "您的密码被重设如要求的。"
 
-#: ../../mod/lostpass.php:85
+#: ../../mod/lostpass.php:91
 msgid "Your new password is"
 msgstr "你的新的密码是"
 
-#: ../../mod/lostpass.php:86
+#: ../../mod/lostpass.php:92
 msgid "Save or copy your new password - and then"
 msgstr "保存或复制新密码-之后"
 
-#: ../../mod/lostpass.php:87
+#: ../../mod/lostpass.php:93
 msgid "click here to login"
 msgstr "在这儿点击"
 
-#: ../../mod/lostpass.php:88
+#: ../../mod/lostpass.php:94
 msgid ""
 "Your password may be changed from the <em>Settings</em> page after "
 "successful login."
 msgstr "您的密码能被变化从<em>设置</em>页成功登记后。"
 
-#: ../../mod/lostpass.php:119
+#: ../../mod/lostpass.php:116
+#, php-format
+msgid "Your password has been changed at %s"
+msgstr ""
+
+#: ../../mod/lostpass.php:131
 msgid "Forgot your Password?"
 msgstr "忘记你的密码吗?"
 
-#: ../../mod/lostpass.php:120
+#: ../../mod/lostpass.php:132
 msgid ""
 "Enter your email address and submit to have your password reset. Then check "
 "your email for further instructions."
 msgstr "输入您的邮件地址和提交为重置密码。然后核对收件箱看别的说明。"
 
-#: ../../mod/lostpass.php:121
+#: ../../mod/lostpass.php:133
 msgid "Nickname or Email: "
 msgstr "昵称或邮件地址:"
 
-#: ../../mod/lostpass.php:122
+#: ../../mod/lostpass.php:134
 msgid "Reset"
 msgstr "复位"
 
-#: ../../mod/settings.php:113
+#: ../../mod/settings.php:35
+msgid "Additional features"
+msgstr ""
+
+#: ../../mod/settings.php:118
 msgid "Missing some important data!"
 msgstr "有的重要信息失踪的!"
 
-#: ../../mod/settings.php:116 ../../mod/settings.php:569
+#: ../../mod/settings.php:121 ../../mod/settings.php:586
 msgid "Update"
 msgstr "更新"
 
-#: ../../mod/settings.php:221
+#: ../../mod/settings.php:227
 msgid "Failed to connect with email account using the settings provided."
 msgstr "不能连接电子邮件账户用输入的设置。"
 
-#: ../../mod/settings.php:226
+#: ../../mod/settings.php:232
 msgid "Email settings updated."
 msgstr "电子邮件设置更新了"
 
-#: ../../mod/settings.php:290
+#: ../../mod/settings.php:247
+msgid "Features updated"
+msgstr ""
+
+#: ../../mod/settings.php:307
 msgid "Passwords do not match. Password unchanged."
 msgstr "密码们不相配。密码没未改变的。"
 
-#: ../../mod/settings.php:295
+#: ../../mod/settings.php:312
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr "空的密码禁止。密码没未改变的。"
 
-#: ../../mod/settings.php:306
+#: ../../mod/settings.php:323
 msgid "Password changed."
 msgstr "密码变化了。"
 
-#: ../../mod/settings.php:308
+#: ../../mod/settings.php:325
 msgid "Password update failed. Please try again."
 msgstr "密码更新失败了。请再试。"
 
-#: ../../mod/settings.php:373
+#: ../../mod/settings.php:390
 msgid " Please use a shorter name."
 msgstr "请用短一点个名。"
 
-#: ../../mod/settings.php:375
+#: ../../mod/settings.php:392
 msgid " Name too short."
 msgstr "名字太短。"
 
-#: ../../mod/settings.php:381
+#: ../../mod/settings.php:398
 msgid " Not valid email."
 msgstr " 电子邮件地址无效."
 
-#: ../../mod/settings.php:383
+#: ../../mod/settings.php:400
 msgid " Cannot change to that email."
 msgstr "不能变化到这个邮件地址。"
 
-#: ../../mod/settings.php:437
+#: ../../mod/settings.php:454
 msgid "Private forum has no privacy permissions. Using default privacy group."
 msgstr ""
 
-#: ../../mod/settings.php:441
+#: ../../mod/settings.php:458
 msgid "Private forum has no privacy permissions and no default privacy group."
 msgstr ""
 
-#: ../../mod/settings.php:471 ../../addon/facebook/facebook.php:495
-#: ../../addon/fbpost/fbpost.php:144
-#: ../../addon/remote_permissions/remote_permissions.php:204
+#: ../../mod/settings.php:488 ../../addon/facebook/facebook.php:497
+#: ../../addon/fbpost/fbpost.php:155
+#: ../../addon/remote_permissions/remote_permissions.php:205
 #: ../../addon/impressum/impressum.php:78
 #: ../../addon/openstreetmap/openstreetmap.php:80
-#: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105
-#: ../../addon/twitter/twitter.php:389
+#: ../../addon/altpager/altpager.php:107 ../../addon/mathjax/mathjax.php:66
+#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:548
 #: ../../addon.old/facebook/facebook.php:495
 #: ../../addon.old/fbpost/fbpost.php:144
 #: ../../addon.old/impressum/impressum.php:78
@@ -2202,443 +2231,456 @@ msgstr ""
 msgid "Settings updated."
 msgstr "设置跟新了"
 
-#: ../../mod/settings.php:542 ../../mod/settings.php:568
-#: ../../mod/settings.php:604
+#: ../../mod/settings.php:559 ../../mod/settings.php:585
+#: ../../mod/settings.php:621
 msgid "Add application"
 msgstr "加入应用"
 
-#: ../../mod/settings.php:546 ../../mod/settings.php:572
-#: ../../addon/statusnet/statusnet.php:570
+#: ../../mod/settings.php:563 ../../mod/settings.php:589
+#: ../../addon/statusnet/statusnet.php:747
 #: ../../addon.old/statusnet/statusnet.php:570
 msgid "Consumer Key"
 msgstr "钥匙(Consumer Key)"
 
-#: ../../mod/settings.php:547 ../../mod/settings.php:573
-#: ../../addon/statusnet/statusnet.php:569
+#: ../../mod/settings.php:564 ../../mod/settings.php:590
+#: ../../addon/statusnet/statusnet.php:746
 #: ../../addon.old/statusnet/statusnet.php:569
 msgid "Consumer Secret"
 msgstr "密码(Consumer Secret)"
 
-#: ../../mod/settings.php:548 ../../mod/settings.php:574
+#: ../../mod/settings.php:565 ../../mod/settings.php:591
 msgid "Redirect"
 msgstr "重定向"
 
-#: ../../mod/settings.php:549 ../../mod/settings.php:575
+#: ../../mod/settings.php:566 ../../mod/settings.php:592
 msgid "Icon url"
 msgstr "图符URL"
 
-#: ../../mod/settings.php:560
+#: ../../mod/settings.php:577
 msgid "You can't edit this application."
 msgstr "您不能编辑这个应用。"
 
-#: ../../mod/settings.php:603
+#: ../../mod/settings.php:620
 msgid "Connected Apps"
 msgstr "连接着应用"
 
-#: ../../mod/settings.php:607
+#: ../../mod/settings.php:624
 msgid "Client key starts with"
 msgstr "客户钥匙头字是"
 
-#: ../../mod/settings.php:608
+#: ../../mod/settings.php:625
 msgid "No name"
 msgstr "无名"
 
-#: ../../mod/settings.php:609
+#: ../../mod/settings.php:626
 msgid "Remove authorization"
 msgstr "撤消权能"
 
-#: ../../mod/settings.php:620
+#: ../../mod/settings.php:638
 msgid "No Plugin settings configured"
 msgstr "没插件设置配置了"
 
-#: ../../mod/settings.php:628 ../../addon/widgets/widgets.php:123
+#: ../../mod/settings.php:646 ../../addon/widgets/widgets.php:124
 #: ../../addon.old/widgets/widgets.php:123
 msgid "Plugin Settings"
 msgstr "插件设置"
 
-#: ../../mod/settings.php:640 ../../mod/settings.php:641
+#: ../../mod/settings.php:660
+msgid "Off"
+msgstr ""
+
+#: ../../mod/settings.php:660
+msgid "On"
+msgstr ""
+
+#: ../../mod/settings.php:668
+msgid "Additional Features"
+msgstr ""
+
+#: ../../mod/settings.php:681 ../../mod/settings.php:682
 #, php-format
 msgid "Built-in support for %s connectivity is %s"
 msgstr "包括的支持为%s连通性是%s"
 
-#: ../../mod/settings.php:640 ../../mod/settings.php:641
+#: ../../mod/settings.php:681 ../../mod/settings.php:682
 msgid "enabled"
 msgstr "能够做的"
 
-#: ../../mod/settings.php:640 ../../mod/settings.php:641
+#: ../../mod/settings.php:681 ../../mod/settings.php:682
 msgid "disabled"
 msgstr "使不能用"
 
-#: ../../mod/settings.php:641
+#: ../../mod/settings.php:682
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: ../../mod/settings.php:673
+#: ../../mod/settings.php:714
 msgid "Email access is disabled on this site."
 msgstr "这个网站没有邮件使用权"
 
-#: ../../mod/settings.php:679
+#: ../../mod/settings.php:721
 msgid "Connector Settings"
 msgstr "连接器设置"
 
-#: ../../mod/settings.php:684
+#: ../../mod/settings.php:726
 msgid "Email/Mailbox Setup"
 msgstr "邮件收件箱设置"
 
-#: ../../mod/settings.php:685
+#: ../../mod/settings.php:727
 msgid ""
 "If you wish to communicate with email contacts using this service "
 "(optional), please specify how to connect to your mailbox."
 msgstr "如果您想用这股服务(可选的)跟邮件熟人交流,请指定怎么连通您的收件箱。"
 
-#: ../../mod/settings.php:686
+#: ../../mod/settings.php:728
 msgid "Last successful email check:"
 msgstr "上个成功收件箱检查:"
 
-#: ../../mod/settings.php:688
+#: ../../mod/settings.php:730
 msgid "IMAP server name:"
 msgstr "IMAP服务器名字:"
 
-#: ../../mod/settings.php:689
+#: ../../mod/settings.php:731
 msgid "IMAP port:"
 msgstr "IMAP服务器端口:"
 
-#: ../../mod/settings.php:690
+#: ../../mod/settings.php:732
 msgid "Security:"
 msgstr "安全:"
 
-#: ../../mod/settings.php:690 ../../mod/settings.php:695
+#: ../../mod/settings.php:732 ../../mod/settings.php:737
+#: ../../addon/fbpost/fbpost.php:255 ../../addon/fbpost/fbpost.php:257
 #: ../../addon/dav/common/wdcal_edit.inc.php:191
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:191
 msgid "None"
 msgstr "没有"
 
-#: ../../mod/settings.php:691
+#: ../../mod/settings.php:733
 msgid "Email login name:"
 msgstr "邮件登记名:"
 
-#: ../../mod/settings.php:692
+#: ../../mod/settings.php:734
 msgid "Email password:"
 msgstr "邮件密码:"
 
-#: ../../mod/settings.php:693
+#: ../../mod/settings.php:735
 msgid "Reply-to address:"
 msgstr "回答地址:"
 
-#: ../../mod/settings.php:694
+#: ../../mod/settings.php:736
 msgid "Send public posts to all email contacts:"
 msgstr "发公开的文章给所有的邮件熟人:"
 
-#: ../../mod/settings.php:695
+#: ../../mod/settings.php:737
 msgid "Action after import:"
 msgstr ""
 
-#: ../../mod/settings.php:695
+#: ../../mod/settings.php:737
 msgid "Mark as seen"
 msgstr ""
 
-#: ../../mod/settings.php:695
+#: ../../mod/settings.php:737
 msgid "Move to folder"
 msgstr ""
 
-#: ../../mod/settings.php:696
+#: ../../mod/settings.php:738
 msgid "Move to folder:"
 msgstr ""
 
-#: ../../mod/settings.php:727 ../../mod/admin.php:402
+#: ../../mod/settings.php:769 ../../mod/admin.php:420
 msgid "No special theme for mobile devices"
 msgstr ""
 
-#: ../../mod/settings.php:767
+#: ../../mod/settings.php:809
 msgid "Display Settings"
 msgstr ""
 
-#: ../../mod/settings.php:773 ../../mod/settings.php:784
+#: ../../mod/settings.php:815 ../../mod/settings.php:826
 msgid "Display Theme:"
 msgstr "显示主题:"
 
-#: ../../mod/settings.php:774
+#: ../../mod/settings.php:816
 msgid "Mobile Theme:"
 msgstr ""
 
-#: ../../mod/settings.php:775
+#: ../../mod/settings.php:817
 msgid "Update browser every xx seconds"
 msgstr "更新游览器每XX秒"
 
-#: ../../mod/settings.php:775
+#: ../../mod/settings.php:817
 msgid "Minimum of 10 seconds, no maximum"
 msgstr "最小10秒,没有上限"
 
-#: ../../mod/settings.php:776
+#: ../../mod/settings.php:818
 msgid "Number of items to display per page:"
 msgstr ""
 
-#: ../../mod/settings.php:776
+#: ../../mod/settings.php:818
 msgid "Maximum of 100 items"
 msgstr ""
 
-#: ../../mod/settings.php:777
+#: ../../mod/settings.php:819
 msgid "Don't show emoticons"
 msgstr ""
 
-#: ../../mod/settings.php:853
+#: ../../mod/settings.php:895
 msgid "Normal Account Page"
 msgstr ""
 
-#: ../../mod/settings.php:854
+#: ../../mod/settings.php:896
 msgid "This account is a normal personal profile"
 msgstr "这个帐户是正常私人简介"
 
-#: ../../mod/settings.php:857
+#: ../../mod/settings.php:899
 msgid "Soapbox Page"
 msgstr ""
 
-#: ../../mod/settings.php:858
+#: ../../mod/settings.php:900
 msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr "自动批准所有联络/友谊要求当只看的迷"
 
-#: ../../mod/settings.php:861
+#: ../../mod/settings.php:903
 msgid "Community Forum/Celebrity Account"
 msgstr ""
 
-#: ../../mod/settings.php:862
+#: ../../mod/settings.php:904
 msgid ""
 "Automatically approve all connection/friend requests as read-write fans"
 msgstr "自动批准所有联络/友谊要求当看写的迷"
 
-#: ../../mod/settings.php:865
+#: ../../mod/settings.php:907
 msgid "Automatic Friend Page"
 msgstr ""
 
-#: ../../mod/settings.php:866
+#: ../../mod/settings.php:908
 msgid "Automatically approve all connection/friend requests as friends"
 msgstr "自动批准所有联络/友谊要求当朋友"
 
-#: ../../mod/settings.php:869
+#: ../../mod/settings.php:911
 msgid "Private Forum [Experimental]"
 msgstr ""
 
-#: ../../mod/settings.php:870
+#: ../../mod/settings.php:912
 msgid "Private forum - approved members only"
 msgstr ""
 
-#: ../../mod/settings.php:882
+#: ../../mod/settings.php:924
 msgid "OpenID:"
 msgstr "OpenID:"
 
-#: ../../mod/settings.php:882
+#: ../../mod/settings.php:924
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr "(可选的)许这个OpenID这个账户登记。"
 
-#: ../../mod/settings.php:892
+#: ../../mod/settings.php:934
 msgid "Publish your default profile in your local site directory?"
 msgstr "出版您默认简介在您当地的网站目录?"
 
-#: ../../mod/settings.php:898
+#: ../../mod/settings.php:940
 msgid "Publish your default profile in the global social directory?"
 msgstr "出版您默认简介在综合社会目录?"
 
-#: ../../mod/settings.php:906
+#: ../../mod/settings.php:948
 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr "藏起来  发现您的熟人/朋友单不让这个简介看着看?\n "
 
-#: ../../mod/settings.php:910
+#: ../../mod/settings.php:952
 msgid "Hide your profile details from unknown viewers?"
 msgstr "使简介信息给陌生的看着看不了?"
 
-#: ../../mod/settings.php:915
+#: ../../mod/settings.php:957
 msgid "Allow friends to post to your profile page?"
 msgstr "允许朋友们贴文章在您的简介页?"
 
-#: ../../mod/settings.php:921
+#: ../../mod/settings.php:963
 msgid "Allow friends to tag your posts?"
 msgstr "允许朋友们标签您的文章?"
 
-#: ../../mod/settings.php:927
+#: ../../mod/settings.php:969
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr "允许我们建议您潜力朋友给新成员?"
 
-#: ../../mod/settings.php:933
+#: ../../mod/settings.php:975
 msgid "Permit unknown people to send you private mail?"
 msgstr ""
 
-#: ../../mod/settings.php:941
+#: ../../mod/settings.php:983
 msgid "Profile is <strong>not published</strong>."
 msgstr "简介是<strong>没出版</strong>"
 
-#: ../../mod/settings.php:944 ../../mod/profile_photo.php:248
+#: ../../mod/settings.php:986 ../../mod/profile_photo.php:248
 msgid "or"
 msgstr "或者"
 
-#: ../../mod/settings.php:949
+#: ../../mod/settings.php:991
 msgid "Your Identity Address is"
 msgstr "您的同一个人地址是"
 
-#: ../../mod/settings.php:960
+#: ../../mod/settings.php:1002
 msgid "Automatically expire posts after this many days:"
-msgstr ""
+msgstr "自动地过期文章这数天:"
 
-#: ../../mod/settings.php:960
+#: ../../mod/settings.php:1002
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr "如果空的,文章不会过期。过期的文章被删除"
 
-#: ../../mod/settings.php:961
+#: ../../mod/settings.php:1003
 msgid "Advanced expiration settings"
 msgstr "先进的过期设置"
 
-#: ../../mod/settings.php:962
+#: ../../mod/settings.php:1004
 msgid "Advanced Expiration"
 msgstr "先进的过期"
 
-#: ../../mod/settings.php:963
+#: ../../mod/settings.php:1005
 msgid "Expire posts:"
 msgstr "把文章过期:"
 
-#: ../../mod/settings.php:964
+#: ../../mod/settings.php:1006
 msgid "Expire personal notes:"
 msgstr "把私人便条过期:"
 
-#: ../../mod/settings.php:965
+#: ../../mod/settings.php:1007
 msgid "Expire starred posts:"
 msgstr "把星的文章过期:"
 
-#: ../../mod/settings.php:966
+#: ../../mod/settings.php:1008
 msgid "Expire photos:"
 msgstr "把照片过期:"
 
-#: ../../mod/settings.php:967
+#: ../../mod/settings.php:1009
 msgid "Only expire posts by others:"
 msgstr ""
 
-#: ../../mod/settings.php:974
+#: ../../mod/settings.php:1016
 msgid "Account Settings"
 msgstr "帐户设置"
 
-#: ../../mod/settings.php:982
+#: ../../mod/settings.php:1024
 msgid "Password Settings"
 msgstr "密码设置"
 
-#: ../../mod/settings.php:983
+#: ../../mod/settings.php:1025
 msgid "New Password:"
 msgstr "新密码:"
 
-#: ../../mod/settings.php:984
+#: ../../mod/settings.php:1026
 msgid "Confirm:"
 msgstr "确认:"
 
-#: ../../mod/settings.php:984
+#: ../../mod/settings.php:1026
 msgid "Leave password fields blank unless changing"
 msgstr "非变化留空密码栏"
 
-#: ../../mod/settings.php:988
+#: ../../mod/settings.php:1030
 msgid "Basic Settings"
 msgstr "基础设置"
 
-#: ../../mod/settings.php:989 ../../include/profile_advanced.php:15
+#: ../../mod/settings.php:1031 ../../include/profile_advanced.php:15
 msgid "Full Name:"
 msgstr "全名:"
 
-#: ../../mod/settings.php:990
+#: ../../mod/settings.php:1032
 msgid "Email Address:"
 msgstr "电子邮件地址:"
 
-#: ../../mod/settings.php:991
+#: ../../mod/settings.php:1033
 msgid "Your Timezone:"
 msgstr "您的时区:"
 
-#: ../../mod/settings.php:992
+#: ../../mod/settings.php:1034
 msgid "Default Post Location:"
 msgstr "默认文章位置:"
 
-#: ../../mod/settings.php:993
+#: ../../mod/settings.php:1035
 msgid "Use Browser Location:"
 msgstr "用游览器位置:"
 
-#: ../../mod/settings.php:996
+#: ../../mod/settings.php:1038
 msgid "Security and Privacy Settings"
 msgstr "安全和隐私设置"
 
-#: ../../mod/settings.php:998
+#: ../../mod/settings.php:1040
 msgid "Maximum Friend Requests/Day:"
 msgstr "最多友谊要求个天:"
 
-#: ../../mod/settings.php:998 ../../mod/settings.php:1017
+#: ../../mod/settings.php:1040 ../../mod/settings.php:1059
 msgid "(to prevent spam abuse)"
 msgstr "(为防止垃圾邮件滥用)"
 
-#: ../../mod/settings.php:999
+#: ../../mod/settings.php:1041
 msgid "Default Post Permissions"
 msgstr "默认文章准许"
 
-#: ../../mod/settings.php:1000
+#: ../../mod/settings.php:1042
 msgid "(click to open/close)"
 msgstr "(点击为打开/关闭)"
 
-#: ../../mod/settings.php:1017
+#: ../../mod/settings.php:1059
 msgid "Maximum private messages per day from unknown people:"
 msgstr ""
 
-#: ../../mod/settings.php:1020
+#: ../../mod/settings.php:1062
 msgid "Notification Settings"
 msgstr "消息设置"
 
-#: ../../mod/settings.php:1021
+#: ../../mod/settings.php:1063
 msgid "By default post a status message when:"
 msgstr ""
 
-#: ../../mod/settings.php:1022
+#: ../../mod/settings.php:1064
 msgid "accepting a friend request"
 msgstr ""
 
-#: ../../mod/settings.php:1023
+#: ../../mod/settings.php:1065
 msgid "joining a forum/community"
 msgstr ""
 
-#: ../../mod/settings.php:1024
+#: ../../mod/settings.php:1066
 msgid "making an <em>interesting</em> profile change"
 msgstr ""
 
-#: ../../mod/settings.php:1025
+#: ../../mod/settings.php:1067
 msgid "Send a notification email when:"
 msgstr "发一个消息要是:"
 
-#: ../../mod/settings.php:1026
+#: ../../mod/settings.php:1068
 msgid "You receive an introduction"
 msgstr "你受到一个介绍"
 
-#: ../../mod/settings.php:1027
+#: ../../mod/settings.php:1069
 msgid "Your introductions are confirmed"
 msgstr "你的介绍确认了"
 
-#: ../../mod/settings.php:1028
+#: ../../mod/settings.php:1070
 msgid "Someone writes on your profile wall"
 msgstr "某人写在你的简历墙"
 
-#: ../../mod/settings.php:1029
+#: ../../mod/settings.php:1071
 msgid "Someone writes a followup comment"
 msgstr "某人写一个后续的评论"
 
-#: ../../mod/settings.php:1030
+#: ../../mod/settings.php:1072
 msgid "You receive a private message"
 msgstr "你受到一个私消息"
 
-#: ../../mod/settings.php:1031
+#: ../../mod/settings.php:1073
 msgid "You receive a friend suggestion"
 msgstr "你受到一个朋友建议"
 
-#: ../../mod/settings.php:1032
+#: ../../mod/settings.php:1074
 msgid "You are tagged in a post"
 msgstr "你被在新闻标签"
 
-#: ../../mod/settings.php:1033
+#: ../../mod/settings.php:1075
 msgid "You are poked/prodded/etc. in a post"
 msgstr ""
 
-#: ../../mod/settings.php:1036
+#: ../../mod/settings.php:1078
 msgid "Advanced Account/Page Type Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1037
+#: ../../mod/settings.php:1079
 msgid "Change the behaviour of this account for special situations"
 msgstr ""
 
@@ -2650,7 +2692,7 @@ msgstr "管理身份或页"
 msgid ""
 "Toggle between different identities or community/group pages which share "
 "your account details or which you have been granted \"manage\" permissions"
-msgstr ""
+msgstr "交替不同同一人或社会/组页合用您的账户或给您「管理」批准"
 
 #: ../../mod/manage.php:99
 msgid "Select an identity to manage: "
@@ -2660,95 +2702,96 @@ msgstr "选择同一个人管理:"
 msgid "Search Results For:"
 msgstr "搜索结果为:"
 
-#: ../../mod/network.php:221 ../../mod/search.php:18
+#: ../../mod/network.php:224 ../../mod/search.php:21
 msgid "Remove term"
 msgstr "删除关键字"
 
-#: ../../mod/network.php:230 ../../mod/search.php:27
+#: ../../mod/network.php:233 ../../mod/search.php:30
+#: ../../include/features.php:41
 msgid "Saved Searches"
 msgstr "保存的搜索"
 
-#: ../../mod/network.php:231 ../../include/group.php:275
+#: ../../mod/network.php:234 ../../include/group.php:275
 msgid "add"
 msgstr "添加"
 
-#: ../../mod/network.php:394
+#: ../../mod/network.php:397
 msgid "Commented Order"
 msgstr "评论时间顺序"
 
-#: ../../mod/network.php:397
+#: ../../mod/network.php:400
 msgid "Sort by Comment Date"
 msgstr ""
 
-#: ../../mod/network.php:400
+#: ../../mod/network.php:403
 msgid "Posted Order"
 msgstr "贴时间顺序"
 
-#: ../../mod/network.php:403
+#: ../../mod/network.php:406
 msgid "Sort by Post Date"
 msgstr ""
 
-#: ../../mod/network.php:410
+#: ../../mod/network.php:447
 msgid "Posts that mention or involve you"
 msgstr ""
 
-#: ../../mod/network.php:413
+#: ../../mod/network.php:453
 msgid "New"
 msgstr "新"
 
-#: ../../mod/network.php:416
+#: ../../mod/network.php:456
 msgid "Activity Stream - by date"
 msgstr ""
 
-#: ../../mod/network.php:419
-msgid "Starred"
-msgstr "被星"
-
-#: ../../mod/network.php:422
-msgid "Favourite Posts"
-msgstr ""
-
-#: ../../mod/network.php:425
+#: ../../mod/network.php:462
 msgid "Shared Links"
 msgstr ""
 
-#: ../../mod/network.php:428
+#: ../../mod/network.php:465
 msgid "Interesting Links"
 msgstr ""
 
-#: ../../mod/network.php:496
+#: ../../mod/network.php:471
+msgid "Starred"
+msgstr "被星"
+
+#: ../../mod/network.php:474
+msgid "Favourite Posts"
+msgstr ""
+
+#: ../../mod/network.php:546
 #, php-format
 msgid "Warning: This group contains %s member from an insecure network."
 msgid_plural ""
 "Warning: This group contains %s members from an insecure network."
 msgstr[0] "警告:这个组包括%s成员从不安全网络。"
 
-#: ../../mod/network.php:499
+#: ../../mod/network.php:549
 msgid "Private messages to this group are at risk of public disclosure."
 msgstr "私人通信给这组回被公开。"
 
-#: ../../mod/network.php:569
+#: ../../mod/network.php:619
 msgid "Contact: "
 msgstr "熟人:"
 
-#: ../../mod/network.php:571
+#: ../../mod/network.php:621
 msgid "Private messages to this person are at risk of public disclosure."
 msgstr "私人通信给这个人回被公开。"
 
-#: ../../mod/network.php:576
+#: ../../mod/network.php:626
 msgid "Invalid contact."
 msgstr "无效熟人。"
 
-#: ../../mod/notes.php:44 ../../boot.php:1753
+#: ../../mod/notes.php:44 ../../boot.php:1812
 msgid "Personal Notes"
 msgstr "私人便条"
 
-#: ../../mod/notes.php:63 ../../mod/filer.php:30
-#: ../../addon/facebook/facebook.php:770
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:263
-#: ../../addon/fbpost/fbpost.php:267
+#: ../../mod/notes.php:63 ../../mod/filer.php:31
+#: ../../addon/facebook/facebook.php:772
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:354
+#: ../../addon/fbpost/fbpost.php:322
 #: ../../addon/dav/friendica/layout.fnk.php:441
-#: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:688
+#: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:742
 #: ../../addon.old/facebook/facebook.php:770
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:263
 #: ../../addon.old/fbpost/fbpost.php:267
@@ -2757,7 +2800,7 @@ msgstr "私人便条"
 msgid "Save"
 msgstr "保存"
 
-#: ../../mod/uimport.php:50 ../../mod/register.php:190
+#: ../../mod/uimport.php:50 ../../mod/register.php:207
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
@@ -2772,10 +2815,20 @@ msgid "Move account"
 msgstr ""
 
 #: ../../mod/uimport.php:67
+msgid "You can import an account from another Friendica server."
+msgstr ""
+
+#: ../../mod/uimport.php:68
 msgid ""
-"You can import an account from another Friendica server. <br>\r\n"
-"                            You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here.<br>\r\n"
-"                            <b>This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from diaspora"
+"You need to export your account from the old server and upload it here. We "
+"will recreate your old account here with all your contacts. We will try also"
+" to inform your friends that you moved here."
+msgstr ""
+
+#: ../../mod/uimport.php:69
+msgid ""
+"This feature is experimental. We can't import contacts from the OStatus "
+"network (statusnet/identi.ca) or from Diaspora"
 msgstr ""
 
 #: ../../mod/uimport.php:70
@@ -2793,7 +2846,7 @@ msgstr ""
 msgid "Number of daily wall messages for %s exceeded. Message failed."
 msgstr ""
 
-#: ../../mod/wallmessage.php:56 ../../mod/message.php:59
+#: ../../mod/wallmessage.php:56 ../../mod/message.php:63
 msgid "No recipient selected."
 msgstr "没有选择的接受者。"
 
@@ -2801,15 +2854,15 @@ msgstr "没有选择的接受者。"
 msgid "Unable to check your home location."
 msgstr ""
 
-#: ../../mod/wallmessage.php:62 ../../mod/message.php:66
+#: ../../mod/wallmessage.php:62 ../../mod/message.php:70
 msgid "Message could not be sent."
 msgstr "消息发不了。"
 
-#: ../../mod/wallmessage.php:65 ../../mod/message.php:69
+#: ../../mod/wallmessage.php:65 ../../mod/message.php:73
 msgid "Message collection failure."
 msgstr "通信受到错误。"
 
-#: ../../mod/wallmessage.php:68 ../../mod/message.php:72
+#: ../../mod/wallmessage.php:68 ../../mod/message.php:76
 msgid "Message sent."
 msgstr "消息发了"
 
@@ -2818,12 +2871,13 @@ msgid "No recipient."
 msgstr ""
 
 #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131
-#: ../../mod/message.php:242 ../../mod/message.php:250
-#: ../../include/conversation.php:902 ../../include/conversation.php:920
+#: ../../mod/message.php:249 ../../mod/message.php:257
+#: ../../mod/message.php:429 ../../mod/message.php:437
+#: ../../include/conversation.php:941 ../../include/conversation.php:959
 msgid "Please enter a link URL:"
 msgstr "请输入环节URL:"
 
-#: ../../mod/wallmessage.php:138 ../../mod/message.php:278
+#: ../../mod/wallmessage.php:138 ../../mod/message.php:285
 msgid "Send Private Message"
 msgstr "发私人的通信"
 
@@ -2834,18 +2888,18 @@ msgid ""
 "your site allow private mail from unknown senders."
 msgstr ""
 
-#: ../../mod/wallmessage.php:140 ../../mod/message.php:279
-#: ../../mod/message.php:469
+#: ../../mod/wallmessage.php:140 ../../mod/message.php:286
+#: ../../mod/message.php:516
 msgid "To:"
 msgstr "到:"
 
-#: ../../mod/wallmessage.php:141 ../../mod/message.php:284
-#: ../../mod/message.php:471
+#: ../../mod/wallmessage.php:141 ../../mod/message.php:291
+#: ../../mod/message.php:518
 msgid "Subject:"
 msgstr "题目:"
 
-#: ../../mod/wallmessage.php:147 ../../mod/message.php:288
-#: ../../mod/message.php:474 ../../mod/invite.php:113
+#: ../../mod/wallmessage.php:147 ../../mod/message.php:295
+#: ../../mod/message.php:521 ../../mod/invite.php:115
 msgid "Your message:"
 msgstr "你的消息:"
 
@@ -2902,7 +2956,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:1729
+#: ../../boot.php:1788
 msgid "Profile"
 msgstr "简介"
 
@@ -2944,7 +2998,7 @@ msgid "Connecting"
 msgstr ""
 
 #: ../../mod/newmember.php:49 ../../mod/newmember.php:51
-#: ../../addon/facebook/facebook.php:728 ../../addon/fbpost/fbpost.php:239
+#: ../../addon/facebook/facebook.php:730 ../../addon/fbpost/fbpost.php:294
 #: ../../include/contact_selectors.php:81
 #: ../../addon.old/facebook/facebook.php:728
 #: ../../addon.old/fbpost/fbpost.php:239
@@ -3065,7 +3119,7 @@ msgstr "组造成了。"
 msgid "Could not create group."
 msgstr "不能造成组。"
 
-#: ../../mod/group.php:47 ../../mod/group.php:137
+#: ../../mod/group.php:47 ../../mod/group.php:140
 msgid "Group not found."
 msgstr "组找不到。"
 
@@ -3077,31 +3131,31 @@ msgstr "组名变化了。"
 msgid "Permission denied"
 msgstr "权限不够"
 
-#: ../../mod/group.php:90
+#: ../../mod/group.php:93
 msgid "Create a group of contacts/friends."
 msgstr "造成组熟人/朋友们。"
 
-#: ../../mod/group.php:91 ../../mod/group.php:177
+#: ../../mod/group.php:94 ../../mod/group.php:180
 msgid "Group Name: "
 msgstr "组名:"
 
-#: ../../mod/group.php:110
+#: ../../mod/group.php:113
 msgid "Group removed."
 msgstr "组删除了。"
 
-#: ../../mod/group.php:112
+#: ../../mod/group.php:115
 msgid "Unable to remove group."
 msgstr "不能删除组。"
 
-#: ../../mod/group.php:176
+#: ../../mod/group.php:179
 msgid "Group Editor"
 msgstr "组编辑器"
 
-#: ../../mod/group.php:189
+#: ../../mod/group.php:192
 msgid "Members"
 msgstr "成员"
 
-#: ../../mod/group.php:221 ../../mod/profperm.php:105
+#: ../../mod/group.php:223 ../../mod/profperm.php:105
 msgid "Click on a contact to add or remove."
 msgstr "点击熟人为添加或删除。"
 
@@ -3125,89 +3179,89 @@ msgstr "所有熟人(跟安全地简介使用权)"
 msgid "No contacts."
 msgstr "没有熟人。"
 
-#: ../../mod/viewcontacts.php:76 ../../include/text.php:625
+#: ../../mod/viewcontacts.php:76 ../../include/text.php:679
 msgid "View Contacts"
 msgstr "看熟人"
 
-#: ../../mod/register.php:89 ../../mod/regmod.php:52
+#: ../../mod/register.php:99 ../../mod/regmod.php:61
 #, php-format
 msgid "Registration details for %s"
 msgstr "注册信息为%s"
 
-#: ../../mod/register.php:97
+#: ../../mod/register.php:107
 msgid ""
 "Registration successful. Please check your email for further instructions."
 msgstr "注册成功了。请咨询说明再您的收件箱。"
 
-#: ../../mod/register.php:101
+#: ../../mod/register.php:111
 msgid "Failed to send email message. Here is the message that failed."
 msgstr "发邮件失败了。这条试失败的消息。"
 
-#: ../../mod/register.php:106
+#: ../../mod/register.php:116
 msgid "Your registration can not be processed."
 msgstr "处理不了您的注册。"
 
-#: ../../mod/register.php:143
+#: ../../mod/register.php:160
 #, php-format
 msgid "Registration request at %s"
 msgstr "注册要求再%s"
 
-#: ../../mod/register.php:152
+#: ../../mod/register.php:169
 msgid "Your registration is pending approval by the site owner."
 msgstr "您的注册等网页主的批准。"
 
-#: ../../mod/register.php:218
+#: ../../mod/register.php:235
 msgid ""
 "You may (optionally) fill in this form via OpenID by supplying your OpenID "
 "and clicking 'Register'."
 msgstr "您会(可选的)用OpenID填这个表格通过提供您的OpenID和点击「注册」。"
 
-#: ../../mod/register.php:219
+#: ../../mod/register.php:236
 msgid ""
 "If you are not familiar with OpenID, please leave that field blank and fill "
 "in the rest of the items."
 msgstr "如果您没熟悉OpenID,请留空这个栏和填另些栏。"
 
-#: ../../mod/register.php:220
+#: ../../mod/register.php:237
 msgid "Your OpenID (optional): "
 msgstr "您的OpenID(可选的):"
 
-#: ../../mod/register.php:234
+#: ../../mod/register.php:251
 msgid "Include your profile in member directory?"
 msgstr "放您的简介再员目录?"
 
-#: ../../mod/register.php:256
+#: ../../mod/register.php:272
 msgid "Membership on this site is by invitation only."
 msgstr "会员身份在这个网站是光通过邀请。"
 
-#: ../../mod/register.php:257
+#: ../../mod/register.php:273
 msgid "Your invitation ID: "
 msgstr "您邀请ID:"
 
-#: ../../mod/register.php:260 ../../mod/admin.php:444
+#: ../../mod/register.php:276 ../../mod/admin.php:462
 msgid "Registration"
 msgstr "注册"
 
-#: ../../mod/register.php:268
+#: ../../mod/register.php:284
 msgid "Your Full Name (e.g. Joe Smith): "
 msgstr "您姓名(例如「张三」):"
 
-#: ../../mod/register.php:269
+#: ../../mod/register.php:285
 msgid "Your Email Address: "
 msgstr "你的电子邮件地址:"
 
-#: ../../mod/register.php:270
+#: ../../mod/register.php:286
 msgid ""
 "Choose a profile nickname. This must begin with a text character. Your "
 "profile address on this site will then be "
 "'<strong>nickname@$sitename</strong>'."
 msgstr "选择简介昵称。昵称头一字必须拉丁字。您再这个网站的简介地址将「<strong>example@$sitename</strong>」."
 
-#: ../../mod/register.php:271
+#: ../../mod/register.php:287
 msgid "Choose a nickname: "
 msgstr "选择昵称:"
 
-#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:921
+#: ../../mod/register.php:290 ../../include/nav.php:81 ../../boot.php:959
 msgid "Register"
 msgstr "注册"
 
@@ -3216,20 +3270,20 @@ msgid "People Search"
 msgstr "搜索人物"
 
 #: ../../mod/like.php:145 ../../mod/subthread.php:87 ../../mod/tagger.php:62
-#: ../../addon/communityhome/communityhome.php:163
-#: ../../view/theme/diabook/theme.php:501 ../../include/text.php:1442
-#: ../../include/diaspora.php:1848 ../../include/conversation.php:125
+#: ../../addon/communityhome/communityhome.php:171
+#: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1499
+#: ../../include/diaspora.php:1851 ../../include/conversation.php:125
 #: ../../include/conversation.php:253
 #: ../../addon.old/communityhome/communityhome.php:163
 msgid "photo"
 msgstr "照片"
 
 #: ../../mod/like.php:145 ../../mod/like.php:298 ../../mod/subthread.php:87
-#: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598
-#: ../../addon/communityhome/communityhome.php:158
-#: ../../addon/communityhome/communityhome.php:167
-#: ../../view/theme/diabook/theme.php:496
-#: ../../view/theme/diabook/theme.php:505 ../../include/diaspora.php:1848
+#: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1600
+#: ../../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
 #: ../../include/conversation.php:120 ../../include/conversation.php:129
 #: ../../include/conversation.php:248 ../../include/conversation.php:257
 #: ../../addon.old/facebook/facebook.php:1598
@@ -3238,9 +3292,9 @@ msgstr "照片"
 msgid "status"
 msgstr "现状"
 
-#: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602
-#: ../../addon/communityhome/communityhome.php:172
-#: ../../view/theme/diabook/theme.php:510 ../../include/diaspora.php:1864
+#: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1604
+#: ../../addon/communityhome/communityhome.php:180
+#: ../../view/theme/diabook/theme.php:473 ../../include/diaspora.php:1867
 #: ../../include/conversation.php:136
 #: ../../addon.old/facebook/facebook.php:1602
 #: ../../addon.old/communityhome/communityhome.php:172
@@ -3254,8 +3308,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:734 ../../mod/admin.php:933 ../../mod/display.php:39
-#: ../../mod/display.php:169 ../../include/items.php:3843
+#: ../../mod/admin.php:773 ../../mod/admin.php:972 ../../mod/display.php:47
+#: ../../mod/display.php:177 ../../include/items.php:3860
 msgid "Item not found."
 msgstr "项目找不到。"
 
@@ -3264,24 +3318,24 @@ msgid "Access denied."
 msgstr "没有用权。"
 
 #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90
-#: ../../include/nav.php:51 ../../boot.php:1736
+#: ../../include/nav.php:51 ../../boot.php:1795
 msgid "Photos"
 msgstr "照片"
 
-#: ../../mod/fbrowser.php:96
+#: ../../mod/fbrowser.php:113
 msgid "Files"
 msgstr ""
 
-#: ../../mod/regmod.php:61
+#: ../../mod/regmod.php:70
 msgid "Account approved."
 msgstr "账户批准了"
 
-#: ../../mod/regmod.php:98
+#: ../../mod/regmod.php:107
 #, php-format
 msgid "Registration revoked for %s"
 msgstr "%s的登记撤销了"
 
-#: ../../mod/regmod.php:110
+#: ../../mod/regmod.php:119
 msgid "Please login."
 msgstr "清登录。"
 
@@ -3293,35 +3347,35 @@ msgstr "找不到当初的新闻"
 msgid "Empty post discarded."
 msgstr "空心的新闻丢弃了"
 
-#: ../../mod/item.php:420 ../../mod/wall_upload.php:135
+#: ../../mod/item.php:424 ../../mod/wall_upload.php:135
 #: ../../mod/wall_upload.php:144 ../../mod/wall_upload.php:151
 #: ../../include/message.php:144
 msgid "Wall Photos"
 msgstr "墙照片"
 
-#: ../../mod/item.php:833
+#: ../../mod/item.php:837
 msgid "System error. Post not saved."
 msgstr "系统错误。x"
 
-#: ../../mod/item.php:858
+#: ../../mod/item.php:862
 #, php-format
 msgid ""
 "This message was sent to you by %s, a member of the Friendica social "
 "network."
 msgstr "这个新闻是由%s,Friendica社会化网络成员之一,发给你。"
 
-#: ../../mod/item.php:860
+#: ../../mod/item.php:864
 #, php-format
 msgid "You may visit them online at %s"
 msgstr "你可以网上拜访他在%s"
 
-#: ../../mod/item.php:861
+#: ../../mod/item.php:865
 msgid ""
 "Please contact the sender by replying to this post if you do not wish to "
 "receive these messages."
 msgstr "你不想受到这些新闻的话,请回答这个新闻给发者联系。"
 
-#: ../../mod/item.php:863
+#: ../../mod/item.php:867
 #, php-format
 msgid "%s posted an update."
 msgstr "%s贴上一个新闻。"
@@ -3420,70 +3474,70 @@ msgstr "这要完全删除您的账户。这一做过,就不能恢复。"
 msgid "Please enter your password for verification:"
 msgstr "请输入密码为确认:"
 
-#: ../../mod/message.php:9 ../../include/nav.php:131
+#: ../../mod/message.php:9 ../../include/nav.php:132
 msgid "New Message"
 msgstr "新的消息"
 
-#: ../../mod/message.php:63
+#: ../../mod/message.php:67
 msgid "Unable to locate contact information."
 msgstr "找不到熟人信息。"
 
-#: ../../mod/message.php:191
+#: ../../mod/message.php:195
 msgid "Message deleted."
 msgstr "消息删除了。"
 
-#: ../../mod/message.php:221
+#: ../../mod/message.php:225
 msgid "Conversation removed."
 msgstr "交流删除了。"
 
-#: ../../mod/message.php:327
+#: ../../mod/message.php:334
 msgid "No messages."
 msgstr "没有消息"
 
-#: ../../mod/message.php:334
+#: ../../mod/message.php:341
 #, php-format
 msgid "Unknown sender - %s"
 msgstr ""
 
-#: ../../mod/message.php:337
+#: ../../mod/message.php:344
 #, php-format
 msgid "You and %s"
 msgstr ""
 
-#: ../../mod/message.php:340
+#: ../../mod/message.php:347
 #, php-format
 msgid "%s and You"
 msgstr ""
 
-#: ../../mod/message.php:350 ../../mod/message.php:462
+#: ../../mod/message.php:368 ../../mod/message.php:509
 msgid "Delete conversation"
 msgstr "删除交谈"
 
-#: ../../mod/message.php:353
+#: ../../mod/message.php:371
 msgid "D, d M Y - g:i A"
 msgstr "D, d M Y - g:i A"
 
-#: ../../mod/message.php:356
+#: ../../mod/message.php:374
 #, php-format
 msgid "%d message"
 msgid_plural "%d messages"
 msgstr[0] ""
 
-#: ../../mod/message.php:391
+#: ../../mod/message.php:413
 msgid "Message not available."
 msgstr "通信不可用的"
 
-#: ../../mod/message.php:444
+#: ../../mod/message.php:483
 msgid "Delete message"
 msgstr "删除消息"
 
-#: ../../mod/message.php:464
+#: ../../mod/message.php:511
 msgid ""
 "No secure communications available. You <strong>may</strong> be able to "
 "respond from the sender's profile page."
 msgstr ""
 
-#: ../../mod/message.php:468
+#: ../../mod/message.php:515
 msgid "Send Reply"
 msgstr "发回答"
 
@@ -3500,19 +3554,19 @@ msgstr "没有朋友展示。"
 msgid "Theme settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:96 ../../mod/admin.php:442
+#: ../../mod/admin.php:96 ../../mod/admin.php:460
 msgid "Site"
 msgstr "网站"
 
-#: ../../mod/admin.php:97 ../../mod/admin.php:688 ../../mod/admin.php:701
+#: ../../mod/admin.php:97 ../../mod/admin.php:727 ../../mod/admin.php:740
 msgid "Users"
 msgstr "用户"
 
-#: ../../mod/admin.php:98 ../../mod/admin.php:783 ../../mod/admin.php:825
+#: ../../mod/admin.php:98 ../../mod/admin.php:822 ../../mod/admin.php:864
 msgid "Plugins"
 msgstr "插件"
 
-#: ../../mod/admin.php:99 ../../mod/admin.php:988 ../../mod/admin.php:1024
+#: ../../mod/admin.php:99 ../../mod/admin.php:1027 ../../mod/admin.php:1063
 msgid "Themes"
 msgstr ""
 
@@ -3520,11 +3574,11 @@ msgstr ""
 msgid "DB updates"
 msgstr ""
 
-#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1111
+#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1150
 msgid "Logs"
 msgstr "记录"
 
-#: ../../mod/admin.php:120 ../../include/nav.php:146
+#: ../../mod/admin.php:120 ../../include/nav.php:151
 msgid "Admin"
 msgstr "管理"
 
@@ -3536,19 +3590,19 @@ msgstr ""
 msgid "User registrations waiting for confirmation"
 msgstr "用户注册等确认"
 
-#: ../../mod/admin.php:183 ../../mod/admin.php:669
+#: ../../mod/admin.php:183 ../../mod/admin.php:698
 msgid "Normal Account"
 msgstr "正常帐户"
 
-#: ../../mod/admin.php:184 ../../mod/admin.php:670
+#: ../../mod/admin.php:184 ../../mod/admin.php:699
 msgid "Soapbox Account"
 msgstr "演讲台帐户"
 
-#: ../../mod/admin.php:185 ../../mod/admin.php:671
+#: ../../mod/admin.php:185 ../../mod/admin.php:700
 msgid "Community/Celebrity Account"
 msgstr "社会/名人帐户"
 
-#: ../../mod/admin.php:186 ../../mod/admin.php:672
+#: ../../mod/admin.php:186 ../../mod/admin.php:701
 msgid "Automatic Friend Account"
 msgstr "自动朋友帐户"
 
@@ -3564,9 +3618,9 @@ msgstr ""
 msgid "Message queues"
 msgstr ""
 
-#: ../../mod/admin.php:212 ../../mod/admin.php:441 ../../mod/admin.php:687
-#: ../../mod/admin.php:782 ../../mod/admin.php:824 ../../mod/admin.php:987
-#: ../../mod/admin.php:1023 ../../mod/admin.php:1110
+#: ../../mod/admin.php:212 ../../mod/admin.php:459 ../../mod/admin.php:726
+#: ../../mod/admin.php:821 ../../mod/admin.php:863 ../../mod/admin.php:1026
+#: ../../mod/admin.php:1062 ../../mod/admin.php:1149
 msgid "Administration"
 msgstr "管理"
 
@@ -3590,560 +3644,620 @@ msgstr "版本"
 msgid "Active plugins"
 msgstr "活跃的插件"
 
-#: ../../mod/admin.php:373
+#: ../../mod/admin.php:391
 msgid "Site settings updated."
 msgstr "网站设置更新了。"
 
-#: ../../mod/admin.php:428
+#: ../../mod/admin.php:446
 msgid "Closed"
 msgstr "关闭"
 
-#: ../../mod/admin.php:429
+#: ../../mod/admin.php:447
 msgid "Requires approval"
 msgstr "要批准"
 
-#: ../../mod/admin.php:430
+#: ../../mod/admin.php:448
 msgid "Open"
 msgstr "打开"
 
-#: ../../mod/admin.php:434
+#: ../../mod/admin.php:452
 msgid "No SSL policy, links will track page SSL state"
 msgstr ""
 
-#: ../../mod/admin.php:435
+#: ../../mod/admin.php:453
 msgid "Force all links to use SSL"
 msgstr ""
 
-#: ../../mod/admin.php:436
+#: ../../mod/admin.php:454
 msgid "Self-signed certificate, use SSL for local links only (discouraged)"
 msgstr ""
 
-#: ../../mod/admin.php:445
+#: ../../mod/admin.php:463
 msgid "File upload"
 msgstr "文件上传"
 
-#: ../../mod/admin.php:446
+#: ../../mod/admin.php:464
 msgid "Policies"
 msgstr "政策"
 
-#: ../../mod/admin.php:447
+#: ../../mod/admin.php:465
 msgid "Advanced"
 msgstr "高等"
 
-#: ../../mod/admin.php:451 ../../addon/statusnet/statusnet.php:567
+#: ../../mod/admin.php:466
+msgid "Performance"
+msgstr ""
+
+#: ../../mod/admin.php:470 ../../addon/statusnet/statusnet.php:744
 #: ../../addon.old/statusnet/statusnet.php:567
 msgid "Site name"
 msgstr "网页名字"
 
-#: ../../mod/admin.php:452
+#: ../../mod/admin.php:471
 msgid "Banner/Logo"
 msgstr "标题/标志"
 
-#: ../../mod/admin.php:453
+#: ../../mod/admin.php:472
 msgid "System language"
 msgstr "系统语言"
 
-#: ../../mod/admin.php:454
+#: ../../mod/admin.php:473
 msgid "System theme"
 msgstr "系统主题"
 
-#: ../../mod/admin.php:454
+#: ../../mod/admin.php:473
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr ""
 
-#: ../../mod/admin.php:455
+#: ../../mod/admin.php:474
 msgid "Mobile system theme"
 msgstr ""
 
-#: ../../mod/admin.php:455
+#: ../../mod/admin.php:474
 msgid "Theme for mobile devices"
 msgstr ""
 
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:475
 msgid "SSL link policy"
 msgstr ""
 
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:475
 msgid "Determines whether generated links should be forced to use SSL"
 msgstr ""
 
-#: ../../mod/admin.php:457
+#: ../../mod/admin.php:476
+msgid "'Share' element"
+msgstr ""
+
+#: ../../mod/admin.php:476
+msgid "Activates the bbcode element 'share' for repeating items."
+msgstr ""
+
+#: ../../mod/admin.php:477
 msgid "Maximum image size"
 msgstr "图片最大尺寸"
 
-#: ../../mod/admin.php:457
+#: ../../mod/admin.php:477
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr ""
 
-#: ../../mod/admin.php:458
+#: ../../mod/admin.php:478
 msgid "Maximum image length"
 msgstr ""
 
-#: ../../mod/admin.php:458
+#: ../../mod/admin.php:478
 msgid ""
 "Maximum length in pixels of the longest side of uploaded images. Default is "
 "-1, which means no limits."
 msgstr ""
 
-#: ../../mod/admin.php:459
+#: ../../mod/admin.php:479
 msgid "JPEG image quality"
 msgstr ""
 
-#: ../../mod/admin.php:459
+#: ../../mod/admin.php:479
 msgid ""
 "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
 "100, which is full quality."
 msgstr ""
 
-#: ../../mod/admin.php:461
+#: ../../mod/admin.php:481
 msgid "Register policy"
 msgstr "注册政策"
 
-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:482
+msgid "Maximum Daily Registrations"
+msgstr ""
+
+#: ../../mod/admin.php:482
+msgid ""
+"If registration is permitted above, this sets the maximum number of new user"
+" registrations to accept per day.  If register is set to closed, this "
+"setting has no effect."
+msgstr ""
+
+#: ../../mod/admin.php:483
 msgid "Register text"
 msgstr "注册正文"
 
-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:483
 msgid "Will be displayed prominently on the registration page."
 msgstr ""
 
-#: ../../mod/admin.php:463
+#: ../../mod/admin.php:484
 msgid "Accounts abandoned after x days"
 msgstr "账户丢弃X天后"
 
-#: ../../mod/admin.php:463
+#: ../../mod/admin.php:484
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr "拒绝浪费系统资源看外网站找丢弃的账户。输入0为无时限。"
 
-#: ../../mod/admin.php:464
+#: ../../mod/admin.php:485
 msgid "Allowed friend domains"
 msgstr "允许的朋友域"
 
-#: ../../mod/admin.php:464
+#: ../../mod/admin.php:485
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr ""
 
-#: ../../mod/admin.php:465
+#: ../../mod/admin.php:486
 msgid "Allowed email domains"
 msgstr "允许的电子邮件域"
 
-#: ../../mod/admin.php:465
+#: ../../mod/admin.php:486
 msgid ""
 "Comma separated list of domains which are allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains"
 msgstr ""
 
-#: ../../mod/admin.php:466
+#: ../../mod/admin.php:487
 msgid "Block public"
 msgstr "拦公开"
 
-#: ../../mod/admin.php:466
+#: ../../mod/admin.php:487
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently logged in."
 msgstr ""
 
-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:488
 msgid "Force publish"
 msgstr "需要出版"
 
-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:488
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 
-#: ../../mod/admin.php:468
+#: ../../mod/admin.php:489
 msgid "Global directory update URL"
 msgstr "综合目录更新URL"
 
-#: ../../mod/admin.php:468
+#: ../../mod/admin.php:489
 msgid ""
 "URL to update the global directory. If this is not set, the global directory"
 " is completely unavailable to the application."
 msgstr ""
 
-#: ../../mod/admin.php:469
+#: ../../mod/admin.php:490
 msgid "Allow threaded items"
 msgstr ""
 
-#: ../../mod/admin.php:469
+#: ../../mod/admin.php:490
 msgid "Allow infinite level threading for items on this site."
 msgstr ""
 
-#: ../../mod/admin.php:470
+#: ../../mod/admin.php:491
 msgid "Private posts by default for new users"
 msgstr ""
 
-#: ../../mod/admin.php:470
+#: ../../mod/admin.php:491
 msgid ""
 "Set default post permissions for all new members to the default privacy "
 "group rather than public."
 msgstr ""
 
-#: ../../mod/admin.php:472
+#: ../../mod/admin.php:493
 msgid "Block multiple registrations"
 msgstr "拦一人多注册"
 
-#: ../../mod/admin.php:472
+#: ../../mod/admin.php:493
 msgid "Disallow users to register additional accounts for use as pages."
 msgstr ""
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:494
 msgid "OpenID support"
 msgstr "OpenID支持"
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:494
 msgid "OpenID support for registration and logins."
 msgstr ""
 
-#: ../../mod/admin.php:474
+#: ../../mod/admin.php:495
 msgid "Fullname check"
 msgstr "全名核实"
 
-#: ../../mod/admin.php:474
+#: ../../mod/admin.php:495
 msgid ""
 "Force users to register with a space between firstname and lastname in Full "
 "name, as an antispam measure"
 msgstr ""
 
-#: ../../mod/admin.php:475
+#: ../../mod/admin.php:496
 msgid "UTF-8 Regular expressions"
 msgstr "UTF-8正则表达式"
 
-#: ../../mod/admin.php:475
+#: ../../mod/admin.php:496
 msgid "Use PHP UTF8 regular expressions"
 msgstr ""
 
-#: ../../mod/admin.php:476
+#: ../../mod/admin.php:497
 msgid "Show Community Page"
 msgstr "表示社会页"
 
-#: ../../mod/admin.php:476
+#: ../../mod/admin.php:497
 msgid ""
 "Display a Community page showing all recent public postings on this site."
 msgstr ""
 
-#: ../../mod/admin.php:477
+#: ../../mod/admin.php:498
 msgid "Enable OStatus support"
 msgstr "使OStatus支持可用"
 
-#: ../../mod/admin.php:477
+#: ../../mod/admin.php:498
 msgid ""
 "Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All "
 "communications in OStatus are public, so privacy warnings will be "
 "occasionally displayed."
 msgstr ""
 
-#: ../../mod/admin.php:478
+#: ../../mod/admin.php:499
 msgid "Enable Diaspora support"
 msgstr "使Diaspora支持能够"
 
-#: ../../mod/admin.php:478
+#: ../../mod/admin.php:499
 msgid "Provide built-in Diaspora network compatibility."
 msgstr ""
 
-#: ../../mod/admin.php:479
+#: ../../mod/admin.php:500
 msgid "Only allow Friendica contacts"
 msgstr "只许Friendica熟人"
 
-#: ../../mod/admin.php:479
+#: ../../mod/admin.php:500
 msgid ""
 "All contacts must use Friendica protocols. All other built-in communication "
 "protocols disabled."
 msgstr ""
 
-#: ../../mod/admin.php:480
+#: ../../mod/admin.php:501
 msgid "Verify SSL"
 msgstr "证实"
 
-#: ../../mod/admin.php:480
+#: ../../mod/admin.php:501
 msgid ""
 "If you wish, you can turn on strict certificate checking. This will mean you"
 " cannot connect (at all) to self-signed SSL sites."
 msgstr ""
 
-#: ../../mod/admin.php:481
+#: ../../mod/admin.php:502
 msgid "Proxy user"
 msgstr "代理用户"
 
-#: ../../mod/admin.php:482
+#: ../../mod/admin.php:503
 msgid "Proxy URL"
 msgstr "代理URL"
 
-#: ../../mod/admin.php:483
+#: ../../mod/admin.php:504
 msgid "Network timeout"
 msgstr "网络超时"
 
-#: ../../mod/admin.php:483
+#: ../../mod/admin.php:504
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 
-#: ../../mod/admin.php:484
+#: ../../mod/admin.php:505
 msgid "Delivery interval"
 msgstr ""
 
-#: ../../mod/admin.php:484
+#: ../../mod/admin.php:505
 msgid ""
 "Delay background delivery processes by this many seconds to reduce system "
 "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
 "for large dedicated servers."
 msgstr ""
 
-#: ../../mod/admin.php:485
+#: ../../mod/admin.php:506
 msgid "Poll interval"
 msgstr ""
 
-#: ../../mod/admin.php:485
+#: ../../mod/admin.php:506
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr ""
 
-#: ../../mod/admin.php:486
+#: ../../mod/admin.php:507
 msgid "Maximum Load Average"
 msgstr ""
 
-#: ../../mod/admin.php:486
+#: ../../mod/admin.php:507
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr ""
 
-#: ../../mod/admin.php:503
-msgid "Update has been marked successful"
+#: ../../mod/admin.php:509
+msgid "Use MySQL full text engine"
+msgstr ""
+
+#: ../../mod/admin.php:509
+msgid ""
+"Activates the full text engine. Speeds up search - but can only search for "
+"four and more characters."
+msgstr ""
+
+#: ../../mod/admin.php:510
+msgid "Path to item cache"
+msgstr ""
+
+#: ../../mod/admin.php:511
+msgid "Cache duration in seconds"
+msgstr ""
+
+#: ../../mod/admin.php:511
+msgid ""
+"How long should the cache files be hold? Default value is 86400 seconds (One"
+" day)."
+msgstr ""
+
+#: ../../mod/admin.php:512
+msgid "Path for lock file"
 msgstr ""
 
 #: ../../mod/admin.php:513
+msgid "Temp path"
+msgstr ""
+
+#: ../../mod/admin.php:514
+msgid "Base path to installation"
+msgstr ""
+
+#: ../../mod/admin.php:532
+msgid "Update has been marked successful"
+msgstr ""
+
+#: ../../mod/admin.php:542
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr ""
 
-#: ../../mod/admin.php:516
+#: ../../mod/admin.php:545
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr ""
 
-#: ../../mod/admin.php:520
+#: ../../mod/admin.php:549
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr ""
 
-#: ../../mod/admin.php:523
+#: ../../mod/admin.php:552
 #, php-format
 msgid "Update function %s could not be found."
 msgstr ""
 
-#: ../../mod/admin.php:538
+#: ../../mod/admin.php:567
 msgid "No failed updates."
 msgstr ""
 
-#: ../../mod/admin.php:542
+#: ../../mod/admin.php:571
 msgid "Failed Updates"
 msgstr ""
 
-#: ../../mod/admin.php:543
+#: ../../mod/admin.php:572
 msgid ""
 "This does not include updates prior to 1139, which did not return a status."
 msgstr ""
 
-#: ../../mod/admin.php:544
+#: ../../mod/admin.php:573
 msgid "Mark success (if update was manually applied)"
 msgstr ""
 
-#: ../../mod/admin.php:545
+#: ../../mod/admin.php:574
 msgid "Attempt to execute this update step automatically"
 msgstr ""
 
-#: ../../mod/admin.php:570
+#: ../../mod/admin.php:599
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] ""
 
-#: ../../mod/admin.php:577
+#: ../../mod/admin.php:606
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] "%s用户删除了"
 
-#: ../../mod/admin.php:616
+#: ../../mod/admin.php:645
 #, php-format
 msgid "User '%s' deleted"
 msgstr "用户「%s」删除了"
 
-#: ../../mod/admin.php:624
+#: ../../mod/admin.php:653
 #, php-format
 msgid "User '%s' unblocked"
 msgstr "用户「%s」无拦了"
 
-#: ../../mod/admin.php:624
+#: ../../mod/admin.php:653
 #, php-format
 msgid "User '%s' blocked"
 msgstr "用户「%s」拦了"
 
-#: ../../mod/admin.php:690
+#: ../../mod/admin.php:729
 msgid "select all"
 msgstr "都选"
 
-#: ../../mod/admin.php:691
+#: ../../mod/admin.php:730
 msgid "User registrations waiting for confirm"
 msgstr "用户注册等待确认"
 
-#: ../../mod/admin.php:692
+#: ../../mod/admin.php:731
 msgid "Request date"
 msgstr "要求日期"
 
-#: ../../mod/admin.php:692 ../../mod/admin.php:702
+#: ../../mod/admin.php:731 ../../mod/admin.php:741
 #: ../../include/contact_selectors.php:79
+#: ../../include/contact_selectors.php:86
 msgid "Email"
 msgstr "电子邮件"
 
-#: ../../mod/admin.php:693
+#: ../../mod/admin.php:732
 msgid "No registrations."
 msgstr "没有注册。"
 
-#: ../../mod/admin.php:695
+#: ../../mod/admin.php:734
 msgid "Deny"
 msgstr "否定"
 
-#: ../../mod/admin.php:699
+#: ../../mod/admin.php:738
 msgid "Site admin"
 msgstr ""
 
-#: ../../mod/admin.php:702
+#: ../../mod/admin.php:741
 msgid "Register date"
 msgstr "注册日期"
 
-#: ../../mod/admin.php:702
+#: ../../mod/admin.php:741
 msgid "Last login"
 msgstr "上次登录"
 
-#: ../../mod/admin.php:702
+#: ../../mod/admin.php:741
 msgid "Last item"
 msgstr "上项目"
 
-#: ../../mod/admin.php:702
+#: ../../mod/admin.php:741
 msgid "Account"
 msgstr "帐户"
 
-#: ../../mod/admin.php:704
+#: ../../mod/admin.php:743
 msgid ""
 "Selected users will be deleted!\\n\\nEverything these users had posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "特定的用户被删除!\\n\\n什么这些用户放在这个网站被永远删除!\\n\\n您肯定吗?"
 
-#: ../../mod/admin.php:705
+#: ../../mod/admin.php:744
 msgid ""
 "The user {0} will be deleted!\\n\\nEverything this user has posted on this "
 "site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "用户{0}将被删除!\\n\\n什么这个用户放在这个网站被永远删除!\\n\\n您肯定吗?"
 
-#: ../../mod/admin.php:746
+#: ../../mod/admin.php:785
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "使插件%s不能用。"
 
-#: ../../mod/admin.php:750
+#: ../../mod/admin.php:789
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "使插件%s能用。"
 
-#: ../../mod/admin.php:760 ../../mod/admin.php:958
+#: ../../mod/admin.php:799 ../../mod/admin.php:997
 msgid "Disable"
 msgstr "使不能用"
 
-#: ../../mod/admin.php:762 ../../mod/admin.php:960
+#: ../../mod/admin.php:801 ../../mod/admin.php:999
 msgid "Enable"
 msgstr "使能用"
 
-#: ../../mod/admin.php:784 ../../mod/admin.php:989
+#: ../../mod/admin.php:823 ../../mod/admin.php:1028
 msgid "Toggle"
 msgstr "肘节"
 
-#: ../../mod/admin.php:792 ../../mod/admin.php:999
+#: ../../mod/admin.php:831 ../../mod/admin.php:1038
 msgid "Author: "
 msgstr ""
 
-#: ../../mod/admin.php:793 ../../mod/admin.php:1000
+#: ../../mod/admin.php:832 ../../mod/admin.php:1039
 msgid "Maintainer: "
 msgstr ""
 
-#: ../../mod/admin.php:922
+#: ../../mod/admin.php:961
 msgid "No themes found."
 msgstr ""
 
-#: ../../mod/admin.php:981
+#: ../../mod/admin.php:1020
 msgid "Screenshot"
 msgstr ""
 
-#: ../../mod/admin.php:1029
+#: ../../mod/admin.php:1068
 msgid "[Experimental]"
 msgstr ""
 
-#: ../../mod/admin.php:1030
+#: ../../mod/admin.php:1069
 msgid "[Unsupported]"
 msgstr ""
 
-#: ../../mod/admin.php:1057
+#: ../../mod/admin.php:1096
 msgid "Log settings updated."
 msgstr "日志设置更新了。"
 
-#: ../../mod/admin.php:1113
+#: ../../mod/admin.php:1152
 msgid "Clear"
 msgstr "清理出"
 
-#: ../../mod/admin.php:1119
+#: ../../mod/admin.php:1158
 msgid "Debugging"
 msgstr "调试"
 
-#: ../../mod/admin.php:1120
+#: ../../mod/admin.php:1159
 msgid "Log file"
 msgstr "记录文件"
 
-#: ../../mod/admin.php:1120
+#: ../../mod/admin.php:1159
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr "必要被网页服务器可写的。相对Friendica主文件夹。"
 
-#: ../../mod/admin.php:1121
+#: ../../mod/admin.php:1160
 msgid "Log level"
 msgstr "记录水平"
 
-#: ../../mod/admin.php:1171
+#: ../../mod/admin.php:1210
 msgid "Close"
 msgstr "关闭"
 
-#: ../../mod/admin.php:1177
+#: ../../mod/admin.php:1216
 msgid "FTP Host"
 msgstr "FTP主机"
 
-#: ../../mod/admin.php:1178
+#: ../../mod/admin.php:1217
 msgid "FTP Path"
 msgstr "FTP目录"
 
-#: ../../mod/admin.php:1179
+#: ../../mod/admin.php:1218
 msgid "FTP User"
 msgstr "FTP用户"
 
-#: ../../mod/admin.php:1180
+#: ../../mod/admin.php:1219
 msgid "FTP Password"
 msgstr "FTP密码"
 
-#: ../../mod/profile.php:21 ../../boot.php:1124
+#: ../../mod/profile.php:21 ../../boot.php:1172
 msgid "Requested profile is not available."
 msgstr "要求的简介联系不上的。"
 
-#: ../../mod/profile.php:155 ../../mod/display.php:87
+#: ../../mod/profile.php:155 ../../mod/display.php:95
 msgid "Access to this profile has been restricted."
 msgstr "使用权这个简介被限制了."
 
@@ -4196,7 +4310,7 @@ msgstr "{0}用#%s标签%s的文章"
 msgid "{0} mentioned you in a post"
 msgstr "{0}提到您在文章"
 
-#: ../../mod/nogroup.php:58
+#: ../../mod/nogroup.php:59
 msgid "Contacts who are not members of a group"
 msgstr ""
 
@@ -4209,8 +4323,8 @@ msgid ""
 "Account not found and OpenID registration is not permitted on this site."
 msgstr ""
 
-#: ../../mod/openid.php:93 ../../include/auth.php:110
-#: ../../include/auth.php:173
+#: ../../mod/openid.php:93 ../../include/auth.php:112
+#: ../../include/auth.php:175
 msgid "Login failed."
 msgstr "登记失败了。"
 
@@ -4231,11 +4345,11 @@ msgstr ""
 msgid "%1$s is following %2$s's %3$s"
 msgstr ""
 
-#: ../../mod/share.php:28
+#: ../../mod/share.php:43
 msgid "link"
 msgstr ""
 
-#: ../../mod/display.php:162
+#: ../../mod/display.php:170
 msgid "Item has been removed."
 msgstr "项目被删除了。"
 
@@ -4247,325 +4361,331 @@ msgstr "应用"
 msgid "No installed applications."
 msgstr "没有安装的应用"
 
-#: ../../mod/search.php:96 ../../include/text.php:685
-#: ../../include/text.php:686 ../../include/nav.php:91
+#: ../../mod/search.php:99 ../../include/text.php:739
+#: ../../include/text.php:740 ../../include/nav.php:91
 msgid "Search"
 msgstr "搜索"
 
-#: ../../mod/profiles.php:21 ../../mod/profiles.php:434
-#: ../../mod/profiles.php:548 ../../mod/dfrn_confirm.php:62
+#: ../../mod/profiles.php:20 ../../mod/profiles.php:135
+#: ../../mod/profiles.php:162 ../../mod/profiles.php:576
+#: ../../mod/dfrn_confirm.php:62
 msgid "Profile not found."
 msgstr "找不到简介。"
 
-#: ../../mod/profiles.php:31
+#: ../../mod/profiles.php:39
+msgid "Profile deleted."
+msgstr "简介删除了。"
+
+#: ../../mod/profiles.php:57 ../../mod/profiles.php:91
+msgid "Profile-"
+msgstr "简介-"
+
+#: ../../mod/profiles.php:76 ../../mod/profiles.php:119
+msgid "New profile created."
+msgstr "创造新的简介"
+
+#: ../../mod/profiles.php:97
+msgid "Profile unavailable to clone."
+msgstr "简介不可用为复制。"
+
+#: ../../mod/profiles.php:172
 msgid "Profile Name is required."
 msgstr "必要简介名"
 
-#: ../../mod/profiles.php:171
+#: ../../mod/profiles.php:319
 msgid "Marital Status"
 msgstr ""
 
-#: ../../mod/profiles.php:175
+#: ../../mod/profiles.php:323
 msgid "Romantic Partner"
 msgstr ""
 
-#: ../../mod/profiles.php:179
+#: ../../mod/profiles.php:327
 msgid "Likes"
 msgstr ""
 
-#: ../../mod/profiles.php:183
+#: ../../mod/profiles.php:331
 msgid "Dislikes"
 msgstr ""
 
-#: ../../mod/profiles.php:187
+#: ../../mod/profiles.php:335
 msgid "Work/Employment"
 msgstr ""
 
-#: ../../mod/profiles.php:190
+#: ../../mod/profiles.php:338
 msgid "Religion"
 msgstr ""
 
-#: ../../mod/profiles.php:194
+#: ../../mod/profiles.php:342
 msgid "Political Views"
 msgstr ""
 
-#: ../../mod/profiles.php:198
+#: ../../mod/profiles.php:346
 msgid "Gender"
 msgstr ""
 
-#: ../../mod/profiles.php:202
+#: ../../mod/profiles.php:350
 msgid "Sexual Preference"
 msgstr ""
 
-#: ../../mod/profiles.php:206
+#: ../../mod/profiles.php:354
 msgid "Homepage"
 msgstr ""
 
-#: ../../mod/profiles.php:210
+#: ../../mod/profiles.php:358
 msgid "Interests"
 msgstr ""
 
-#: ../../mod/profiles.php:214
+#: ../../mod/profiles.php:362
 msgid "Address"
 msgstr ""
 
-#: ../../mod/profiles.php:221 ../../addon/dav/common/wdcal_edit.inc.php:183
+#: ../../mod/profiles.php:369 ../../addon/dav/common/wdcal_edit.inc.php:183
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:183
 msgid "Location"
 msgstr ""
 
-#: ../../mod/profiles.php:304
+#: ../../mod/profiles.php:452
 msgid "Profile updated."
 msgstr "简介更新了。"
 
-#: ../../mod/profiles.php:371
+#: ../../mod/profiles.php:519
 msgid " and "
 msgstr ""
 
-#: ../../mod/profiles.php:379
+#: ../../mod/profiles.php:527
 msgid "public profile"
 msgstr ""
 
-#: ../../mod/profiles.php:382
+#: ../../mod/profiles.php:530
 #, php-format
 msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
 msgstr ""
 
-#: ../../mod/profiles.php:383
+#: ../../mod/profiles.php:531
 #, php-format
 msgid " - Visit %1$s's %2$s"
 msgstr ""
 
-#: ../../mod/profiles.php:386
+#: ../../mod/profiles.php:534
 #, php-format
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr ""
 
-#: ../../mod/profiles.php:453
-msgid "Profile deleted."
-msgstr "简介删除了。"
-
-#: ../../mod/profiles.php:471 ../../mod/profiles.php:505
-msgid "Profile-"
-msgstr "简介-"
-
-#: ../../mod/profiles.php:490 ../../mod/profiles.php:532
-msgid "New profile created."
-msgstr "创造新的简介"
-
-#: ../../mod/profiles.php:511
-msgid "Profile unavailable to clone."
-msgstr "简介不可用为复制。"
-
-#: ../../mod/profiles.php:573
+#: ../../mod/profiles.php:602
 msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr "藏起来发现您的熟人/朋友单不让这个简介看着看?"
 
-#: ../../mod/profiles.php:593
+#: ../../mod/profiles.php:622
 msgid "Edit Profile Details"
 msgstr "剪辑简介消息"
 
-#: ../../mod/profiles.php:595
+#: ../../mod/profiles.php:624
+msgid "Change Profile Photo"
+msgstr ""
+
+#: ../../mod/profiles.php:625
 msgid "View this profile"
 msgstr "看这个简介"
 
-#: ../../mod/profiles.php:596
+#: ../../mod/profiles.php:626
 msgid "Create a new profile using these settings"
 msgstr "造成新的简介用这些设置"
 
-#: ../../mod/profiles.php:597
+#: ../../mod/profiles.php:627
 msgid "Clone this profile"
 msgstr "复制这个简介"
 
-#: ../../mod/profiles.php:598
+#: ../../mod/profiles.php:628
 msgid "Delete this profile"
 msgstr "删除这个简介"
 
-#: ../../mod/profiles.php:599
+#: ../../mod/profiles.php:629
 msgid "Profile Name:"
 msgstr "简介名:"
 
-#: ../../mod/profiles.php:600
+#: ../../mod/profiles.php:630
 msgid "Your Full Name:"
 msgstr "你的全名:"
 
-#: ../../mod/profiles.php:601
+#: ../../mod/profiles.php:631
 msgid "Title/Description:"
 msgstr "标题/描述:"
 
-#: ../../mod/profiles.php:602
+#: ../../mod/profiles.php:632
 msgid "Your Gender:"
 msgstr "你的性:"
 
-#: ../../mod/profiles.php:603
+#: ../../mod/profiles.php:633
 #, php-format
 msgid "Birthday (%s):"
 msgstr "生日(%s):"
 
-#: ../../mod/profiles.php:604
+#: ../../mod/profiles.php:634
 msgid "Street Address:"
 msgstr "地址:"
 
-#: ../../mod/profiles.php:605
+#: ../../mod/profiles.php:635
 msgid "Locality/City:"
 msgstr "现场/城市:"
 
-#: ../../mod/profiles.php:606
+#: ../../mod/profiles.php:636
 msgid "Postal/Zip Code:"
 msgstr "邮政编码:"
 
-#: ../../mod/profiles.php:607
+#: ../../mod/profiles.php:637
 msgid "Country:"
 msgstr "国家:"
 
-#: ../../mod/profiles.php:608
+#: ../../mod/profiles.php:638
 msgid "Region/State:"
 msgstr "区域/省"
 
-#: ../../mod/profiles.php:609
+#: ../../mod/profiles.php:639
 msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr "<span class=\"heart\">&hearts;</span>婚姻状况:"
 
-#: ../../mod/profiles.php:610
+#: ../../mod/profiles.php:640
 msgid "Who: (if applicable)"
 msgstr "谁:(要是使用)"
 
-#: ../../mod/profiles.php:611
+#: ../../mod/profiles.php:641
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr "比如:limou,李某,limou@example。com"
 
-#: ../../mod/profiles.php:612
+#: ../../mod/profiles.php:642
 msgid "Since [date]:"
 msgstr ""
 
-#: ../../mod/profiles.php:613 ../../include/profile_advanced.php:46
+#: ../../mod/profiles.php:643 ../../include/profile_advanced.php:46
 msgid "Sexual Preference:"
 msgstr "性取向"
 
-#: ../../mod/profiles.php:614
+#: ../../mod/profiles.php:644
 msgid "Homepage URL:"
 msgstr "主页URL:"
 
-#: ../../mod/profiles.php:615 ../../include/profile_advanced.php:50
+#: ../../mod/profiles.php:645 ../../include/profile_advanced.php:50
 msgid "Hometown:"
 msgstr ""
 
-#: ../../mod/profiles.php:616 ../../include/profile_advanced.php:54
+#: ../../mod/profiles.php:646 ../../include/profile_advanced.php:54
 msgid "Political Views:"
 msgstr "政治观念:"
 
-#: ../../mod/profiles.php:617
+#: ../../mod/profiles.php:647
 msgid "Religious Views:"
 msgstr " 宗教信仰 :"
 
-#: ../../mod/profiles.php:618
+#: ../../mod/profiles.php:648
 msgid "Public Keywords:"
 msgstr "公开关键字 :"
 
-#: ../../mod/profiles.php:619
+#: ../../mod/profiles.php:649
 msgid "Private Keywords:"
 msgstr "私人关键字"
 
-#: ../../mod/profiles.php:620 ../../include/profile_advanced.php:62
+#: ../../mod/profiles.php:650 ../../include/profile_advanced.php:62
 msgid "Likes:"
 msgstr ""
 
-#: ../../mod/profiles.php:621 ../../include/profile_advanced.php:64
+#: ../../mod/profiles.php:651 ../../include/profile_advanced.php:64
 msgid "Dislikes:"
 msgstr ""
 
-#: ../../mod/profiles.php:622
+#: ../../mod/profiles.php:652
 msgid "Example: fishing photography software"
 msgstr "例如:钓鱼 照片 软件"
 
-#: ../../mod/profiles.php:623
+#: ../../mod/profiles.php:653
 msgid "(Used for suggesting potential friends, can be seen by others)"
 msgstr "(用于建议可能的朋友们,会被别人看)"
 
-#: ../../mod/profiles.php:624
+#: ../../mod/profiles.php:654
 msgid "(Used for searching profiles, never shown to others)"
 msgstr "(用于搜索简介,没有给别人看)"
 
-#: ../../mod/profiles.php:625
+#: ../../mod/profiles.php:655
 msgid "Tell us about yourself..."
 msgstr "给我们自我介绍..."
 
-#: ../../mod/profiles.php:626
+#: ../../mod/profiles.php:656
 msgid "Hobbies/Interests"
 msgstr "爱好/兴趣"
 
-#: ../../mod/profiles.php:627
+#: ../../mod/profiles.php:657
 msgid "Contact information and Social Networks"
 msgstr "熟人信息和社会化网络"
 
-#: ../../mod/profiles.php:628
+#: ../../mod/profiles.php:658
 msgid "Musical interests"
 msgstr "音乐兴趣"
 
-#: ../../mod/profiles.php:629
+#: ../../mod/profiles.php:659
 msgid "Books, literature"
 msgstr "书,文学"
 
-#: ../../mod/profiles.php:630
+#: ../../mod/profiles.php:660
 msgid "Television"
 msgstr "电视"
 
-#: ../../mod/profiles.php:631
+#: ../../mod/profiles.php:661
 msgid "Film/dance/culture/entertainment"
 msgstr "电影/跳舞/文化/娱乐"
 
-#: ../../mod/profiles.php:632
+#: ../../mod/profiles.php:662
 msgid "Love/romance"
 msgstr "爱情/浪漫"
 
-#: ../../mod/profiles.php:633
+#: ../../mod/profiles.php:663
 msgid "Work/employment"
 msgstr "工作"
 
-#: ../../mod/profiles.php:634
+#: ../../mod/profiles.php:664
 msgid "School/education"
 msgstr "学院/教育"
 
-#: ../../mod/profiles.php:639
+#: ../../mod/profiles.php:669
 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:649 ../../mod/directory.php:111
+#: ../../mod/profiles.php:679 ../../mod/directory.php:111
+#: ../../addon/forumdirectory/forumdirectory.php:133
 msgid "Age: "
 msgstr "年纪:"
 
-#: ../../mod/profiles.php:688
+#: ../../mod/profiles.php:718
 msgid "Edit/Manage Profiles"
 msgstr "编辑/管理简介"
 
-#: ../../mod/profiles.php:689 ../../boot.php:1242
+#: ../../mod/profiles.php:719 ../../boot.php:1292
 msgid "Change profile photo"
 msgstr "换简介照片"
 
-#: ../../mod/profiles.php:690 ../../boot.php:1243
+#: ../../mod/profiles.php:720 ../../boot.php:1293
 msgid "Create New Profile"
 msgstr "创造新的简介"
 
-#: ../../mod/profiles.php:701 ../../boot.php:1253
+#: ../../mod/profiles.php:731 ../../boot.php:1303
 msgid "Profile Image"
 msgstr "简介图像"
 
-#: ../../mod/profiles.php:703 ../../boot.php:1256
+#: ../../mod/profiles.php:733 ../../boot.php:1306
 msgid "visible to everybody"
 msgstr "给打假可见的"
 
-#: ../../mod/profiles.php:704 ../../boot.php:1257
+#: ../../mod/profiles.php:734 ../../boot.php:1307
 msgid "Edit visibility"
 msgstr "修改能见度"
 
-#: ../../mod/filer.php:29 ../../include/conversation.php:906
-#: ../../include/conversation.php:924
+#: ../../mod/filer.php:30 ../../include/conversation.php:945
+#: ../../include/conversation.php:963
 msgid "Save to Folder:"
 msgstr ""
 
-#: ../../mod/filer.php:29
+#: ../../mod/filer.php:30
 msgid "- select -"
 msgstr ""
 
@@ -4576,30 +4696,30 @@ msgstr "%1$s把%4$s标签%2$s的%3$s"
 
 #: ../../mod/delegate.php:95
 msgid "No potential page delegates located."
-msgstr ""
+msgstr "找不到可能代表页人。"
 
-#: ../../mod/delegate.php:121
+#: ../../mod/delegate.php:121 ../../include/nav.php:138
 msgid "Delegate Page Management"
-msgstr ""
+msgstr "页代表管理"
 
 #: ../../mod/delegate.php:123
 msgid ""
 "Delegates are able to manage all aspects of this account/page except for "
 "basic account settings. Please do not delegate your personal account to "
 "anybody that you do not trust completely."
-msgstr ""
+msgstr "代表会管理所有的方面这个账户/页除了基础账户配置以外。请别代表您私人账户给您没完全信的人。"
 
 #: ../../mod/delegate.php:124
 msgid "Existing Page Managers"
-msgstr ""
+msgstr "目前页管理员"
 
 #: ../../mod/delegate.php:126
 msgid "Existing Page Delegates"
-msgstr ""
+msgstr "目前页代表"
 
 #: ../../mod/delegate.php:128
 msgid "Potential Delegates"
-msgstr ""
+msgstr "潜力的代表"
 
 #: ../../mod/delegate.php:131
 msgid "Add"
@@ -4653,7 +4773,7 @@ msgstr ""
 msgid "diaspora2bb: "
 msgstr ""
 
-#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:557
+#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:520
 #: ../../include/contact_widgets.php:34
 msgid "Friend Suggestions"
 msgstr "友谊建议"
@@ -4668,70 +4788,78 @@ msgstr "没有建议。如果这是新网站,请24小时后再试。"
 msgid "Ignore/Hide"
 msgstr "不理/隐藏"
 
-#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:555
+#: ../../mod/directory.php:49 ../../addon/forumdirectory/forumdirectory.php:71
+#: ../../view/theme/diabook/theme.php:518
 msgid "Global Directory"
 msgstr "综合目录"
 
-#: ../../mod/directory.php:57
+#: ../../mod/directory.php:57 ../../addon/forumdirectory/forumdirectory.php:79
 msgid "Find on this site"
 msgstr "找在这网站"
 
-#: ../../mod/directory.php:60
+#: ../../mod/directory.php:60 ../../addon/forumdirectory/forumdirectory.php:82
 msgid "Site Directory"
 msgstr "网站目录"
 
 #: ../../mod/directory.php:114
+#: ../../addon/forumdirectory/forumdirectory.php:136
 msgid "Gender: "
 msgstr "性别:"
 
-#: ../../mod/directory.php:136 ../../include/profile_advanced.php:17
-#: ../../boot.php:1278
+#: ../../mod/directory.php:136
+#: ../../addon/forumdirectory/forumdirectory.php:158
+#: ../../include/profile_advanced.php:17 ../../boot.php:1328
 msgid "Gender:"
 msgstr "性别:"
 
-#: ../../mod/directory.php:138 ../../include/profile_advanced.php:37
-#: ../../boot.php:1281
+#: ../../mod/directory.php:138
+#: ../../addon/forumdirectory/forumdirectory.php:160
+#: ../../include/profile_advanced.php:37 ../../boot.php:1331
 msgid "Status:"
 msgstr "现状:"
 
-#: ../../mod/directory.php:140 ../../include/profile_advanced.php:48
-#: ../../boot.php:1283
+#: ../../mod/directory.php:140
+#: ../../addon/forumdirectory/forumdirectory.php:162
+#: ../../include/profile_advanced.php:48 ../../boot.php:1333
 msgid "Homepage:"
 msgstr "主页:"
 
-#: ../../mod/directory.php:142 ../../include/profile_advanced.php:58
+#: ../../mod/directory.php:142
+#: ../../addon/forumdirectory/forumdirectory.php:164
+#: ../../include/profile_advanced.php:58
 msgid "About:"
 msgstr "关于:"
 
-#: ../../mod/directory.php:180
+#: ../../mod/directory.php:187
+#: ../../addon/forumdirectory/forumdirectory.php:203
 msgid "No entries (some entries may be hidden)."
 msgstr "没有文章(有的文章会被隐藏)。"
 
-#: ../../mod/invite.php:35
+#: ../../mod/invite.php:37
 #, php-format
 msgid "%s : Not a valid email address."
 msgstr "%s : 不是效的电子邮件地址."
 
-#: ../../mod/invite.php:59
+#: ../../mod/invite.php:61
 msgid "Please join us on Friendica"
 msgstr ""
 
-#: ../../mod/invite.php:69
+#: ../../mod/invite.php:71
 #, php-format
 msgid "%s : Message delivery failed."
 msgstr "%s : 送消息失败了。"
 
-#: ../../mod/invite.php:73
+#: ../../mod/invite.php:75
 #, php-format
 msgid "%d message sent."
 msgid_plural "%d messages sent."
 msgstr[0] "%d消息传送了。"
 
-#: ../../mod/invite.php:92
+#: ../../mod/invite.php:94
 msgid "You have no more invitations available"
 msgstr "您没有别的邀请"
 
-#: ../../mod/invite.php:100
+#: ../../mod/invite.php:102
 #, php-format
 msgid ""
 "Visit %s for a list of public sites that you can join. Friendica members on "
@@ -4739,14 +4867,14 @@ msgid ""
 " other social networks."
 msgstr ""
 
-#: ../../mod/invite.php:102
+#: ../../mod/invite.php:104
 #, php-format
 msgid ""
 "To accept this invitation, please visit and register at %s or any other "
 "public Friendica website."
 msgstr ""
 
-#: ../../mod/invite.php:103
+#: ../../mod/invite.php:105
 #, php-format
 msgid ""
 "Friendica sites all inter-connect to create a huge privacy-enhanced social "
@@ -4755,36 +4883,36 @@ msgid ""
 "sites you can join."
 msgstr ""
 
-#: ../../mod/invite.php:106
+#: ../../mod/invite.php:108
 msgid ""
 "Our apologies. This system is not currently configured to connect with other"
 " public sites or invite members."
 msgstr ""
 
-#: ../../mod/invite.php:111
+#: ../../mod/invite.php:113
 msgid "Send invitations"
 msgstr "发请柬"
 
-#: ../../mod/invite.php:112
+#: ../../mod/invite.php:114
 msgid "Enter email addresses, one per line:"
 msgstr "输入电子邮件地址,一行一个:"
 
-#: ../../mod/invite.php:114
+#: ../../mod/invite.php:116
 msgid ""
 "You are cordially invited to join me and other close friends on Friendica - "
 "and help us to create a better social web."
 msgstr ""
 
-#: ../../mod/invite.php:116
+#: ../../mod/invite.php:118
 msgid "You will need to supply this invitation code: $invite_code"
 msgstr "您要输入这个邀请密码:$invite_code"
 
-#: ../../mod/invite.php:116
+#: ../../mod/invite.php:118
 msgid ""
 "Once you have registered, please connect with me via my profile page at:"
 msgstr "您一注册,请页跟我连接,用我的简介在:"
 
-#: ../../mod/invite.php:118
+#: ../../mod/invite.php:120
 msgid ""
 "For more information about the Friendica project and why we feel it is "
 "important, please visit http://friendica.com"
@@ -4867,68 +4995,68 @@ msgstr "不能创作您的熟人证件在我们的系统。"
 msgid "Unable to update your contact profile details on our system"
 msgstr "不能更新您的熟人简介消息在我们的系统"
 
-#: ../../mod/dfrn_confirm.php:750
+#: ../../mod/dfrn_confirm.php:760
 #, php-format
 msgid "Connection accepted at %s"
 msgstr "联络接受了在%s"
 
-#: ../../mod/dfrn_confirm.php:799
+#: ../../mod/dfrn_confirm.php:809
 #, php-format
 msgid "%1$s has joined %2$s"
 msgstr ""
 
-#: ../../addon/fromgplus/fromgplus.php:29
+#: ../../addon/fromgplus/fromgplus.php:33
 #: ../../addon.old/fromgplus/fromgplus.php:29
 msgid "Google+ Import Settings"
 msgstr ""
 
-#: ../../addon/fromgplus/fromgplus.php:32
+#: ../../addon/fromgplus/fromgplus.php:36
 #: ../../addon.old/fromgplus/fromgplus.php:32
 msgid "Enable Google+ Import"
 msgstr ""
 
-#: ../../addon/fromgplus/fromgplus.php:35
+#: ../../addon/fromgplus/fromgplus.php:39
 #: ../../addon.old/fromgplus/fromgplus.php:35
 msgid "Google Account ID"
 msgstr ""
 
-#: ../../addon/fromgplus/fromgplus.php:55
+#: ../../addon/fromgplus/fromgplus.php:59
 #: ../../addon.old/fromgplus/fromgplus.php:55
 msgid "Google+ Import Settings saved."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:523
+#: ../../addon/facebook/facebook.php:525
 #: ../../addon.old/facebook/facebook.php:523
 msgid "Facebook disabled"
 msgstr "Facebook废"
 
-#: ../../addon/facebook/facebook.php:528
+#: ../../addon/facebook/facebook.php:530
 #: ../../addon.old/facebook/facebook.php:528
 msgid "Updating contacts"
 msgstr "正才更新熟人"
 
-#: ../../addon/facebook/facebook.php:551 ../../addon/fbpost/fbpost.php:192
+#: ../../addon/facebook/facebook.php:553 ../../addon/fbpost/fbpost.php:203
 #: ../../addon.old/facebook/facebook.php:551
 #: ../../addon.old/fbpost/fbpost.php:192
 msgid "Facebook API key is missing."
 msgstr "Facebook API钥匙失踪的。"
 
-#: ../../addon/facebook/facebook.php:558
+#: ../../addon/facebook/facebook.php:560
 #: ../../addon.old/facebook/facebook.php:558
 msgid "Facebook Connect"
 msgstr "Facebook联络"
 
-#: ../../addon/facebook/facebook.php:564
+#: ../../addon/facebook/facebook.php:566
 #: ../../addon.old/facebook/facebook.php:564
 msgid "Install Facebook connector for this account."
 msgstr "安装Facebook连接器为这个账户。"
 
-#: ../../addon/facebook/facebook.php:571
+#: ../../addon/facebook/facebook.php:573
 #: ../../addon.old/facebook/facebook.php:571
 msgid "Remove Facebook connector"
 msgstr "删除Facebook连接器"
 
-#: ../../addon/facebook/facebook.php:576 ../../addon/fbpost/fbpost.php:217
+#: ../../addon/facebook/facebook.php:578 ../../addon/fbpost/fbpost.php:228
 #: ../../addon.old/facebook/facebook.php:576
 #: ../../addon.old/fbpost/fbpost.php:217
 msgid ""
@@ -4936,63 +5064,63 @@ msgid ""
 "changed.]"
 msgstr "复认证[这是必要的每当您Facebook密码变化了]"
 
-#: ../../addon/facebook/facebook.php:583 ../../addon/fbpost/fbpost.php:224
+#: ../../addon/facebook/facebook.php:585 ../../addon/fbpost/fbpost.php:235
 #: ../../addon.old/facebook/facebook.php:583
 #: ../../addon.old/fbpost/fbpost.php:224
 msgid "Post to Facebook by default"
 msgstr "默认地放在Facebook"
 
-#: ../../addon/facebook/facebook.php:589
+#: ../../addon/facebook/facebook.php:591
 #: ../../addon.old/facebook/facebook.php:589
 msgid ""
 "Facebook friend linking has been disabled on this site. The following "
 "settings will have no effect."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:593
+#: ../../addon/facebook/facebook.php:595
 #: ../../addon.old/facebook/facebook.php:593
 msgid ""
 "Facebook friend linking has been disabled on this site. If you disable it, "
 "you will be unable to re-enable it."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:596
+#: ../../addon/facebook/facebook.php:598
 #: ../../addon.old/facebook/facebook.php:596
 msgid "Link all your Facebook friends and conversations on this website"
 msgstr "连接您所有的Facebook朋友们和交流在这个网站"
 
-#: ../../addon/facebook/facebook.php:598
+#: ../../addon/facebook/facebook.php:600
 #: ../../addon.old/facebook/facebook.php:598
 msgid ""
 "Facebook conversations consist of your <em>profile wall</em> and your friend"
 " <em>stream</em>."
 msgstr "Facebook交流由您的<em>简介墙</em>和您朋友的<em>溪流</em>组成。 "
 
-#: ../../addon/facebook/facebook.php:599
+#: ../../addon/facebook/facebook.php:601
 #: ../../addon.old/facebook/facebook.php:599
 msgid "On this website, your Facebook friend stream is only visible to you."
 msgstr "在这个网站,您Facebook朋友溪流是只您可见的。"
 
-#: ../../addon/facebook/facebook.php:600
+#: ../../addon/facebook/facebook.php:602
 #: ../../addon.old/facebook/facebook.php:600
 msgid ""
 "The following settings determine the privacy of your Facebook profile wall "
 "on this website."
 msgstr "下面的设置决定您在这个网站Facebook简介墙的隐私。"
 
-#: ../../addon/facebook/facebook.php:604
+#: ../../addon/facebook/facebook.php:606
 #: ../../addon.old/facebook/facebook.php:604
 msgid ""
 "On this website your Facebook profile wall conversations will only be "
 "visible to you"
 msgstr "在这个网站您Facebook简介墙交流是只您可见的。"
 
-#: ../../addon/facebook/facebook.php:609
+#: ../../addon/facebook/facebook.php:611
 #: ../../addon.old/facebook/facebook.php:609
 msgid "Do not import your Facebook profile wall conversations"
 msgstr "别进口您Facebook简介墙交流"
 
-#: ../../addon/facebook/facebook.php:611
+#: ../../addon/facebook/facebook.php:613
 #: ../../addon.old/facebook/facebook.php:611
 msgid ""
 "If you choose to link conversations and leave both of these boxes unchecked,"
@@ -5001,28 +5129,40 @@ msgid ""
 "who may see the conversations."
 msgstr "如果您选择连接交流和留这两个复选框空则,您Facebook简介墙被在您这网站的简介墙融合和您的这网站隐私设置决定谁能看那些交流。"
 
-#: ../../addon/facebook/facebook.php:616
+#: ../../addon/facebook/facebook.php:618
 #: ../../addon.old/facebook/facebook.php:616
 msgid "Comma separated applications to ignore"
 msgstr "逗号分开的应用要不理"
 
-#: ../../addon/facebook/facebook.php:700
+#: ../../addon/facebook/facebook.php:702
 #: ../../addon.old/facebook/facebook.php:700
 msgid "Problems with Facebook Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:729
+#: ../../addon/facebook/facebook.php:704
+#: ../../addon/facebook/facebook.php:1202 ../../addon/fbpost/fbpost.php:817
+#: ../../addon/public_server/public_server.php:62
+#: ../../addon/testdrive/testdrive.php:67
+#: ../../addon.old/facebook/facebook.php:702
+#: ../../addon.old/facebook/facebook.php:1200
+#: ../../addon.old/fbpost/fbpost.php:661
+#: ../../addon.old/public_server/public_server.php:62
+#: ../../addon.old/testdrive/testdrive.php:67
+msgid "Administrator"
+msgstr "管理员"
+
+#: ../../addon/facebook/facebook.php:731
 #: ../../addon.old/facebook/facebook.php:729
 msgid "Facebook Connector Settings"
 msgstr "Facebook连接器设置"
 
-#: ../../addon/facebook/facebook.php:744 ../../addon/fbpost/fbpost.php:255
+#: ../../addon/facebook/facebook.php:746 ../../addon/fbpost/fbpost.php:310
 #: ../../addon.old/facebook/facebook.php:744
 #: ../../addon.old/fbpost/fbpost.php:255
 msgid "Facebook API Key"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:754 ../../addon/fbpost/fbpost.php:262
+#: ../../addon/facebook/facebook.php:756 ../../addon/fbpost/fbpost.php:317
 #: ../../addon.old/facebook/facebook.php:754
 #: ../../addon.old/fbpost/fbpost.php:262
 msgid ""
@@ -5031,76 +5171,76 @@ msgid ""
 "using this form.<br><br>"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:759
+#: ../../addon/facebook/facebook.php:761
 #: ../../addon.old/facebook/facebook.php:759
 msgid ""
 "Error: the given API Key seems to be incorrect (the application access token"
 " could not be retrieved)."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:761
+#: ../../addon/facebook/facebook.php:763
 #: ../../addon.old/facebook/facebook.php:761
 msgid "The given API Key seems to work correctly."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:763
+#: ../../addon/facebook/facebook.php:765
 #: ../../addon.old/facebook/facebook.php:763
 msgid ""
 "The correctness of the API Key could not be detected. Something strange's "
 "going on."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:766 ../../addon/fbpost/fbpost.php:264
+#: ../../addon/facebook/facebook.php:768 ../../addon/fbpost/fbpost.php:319
 #: ../../addon.old/facebook/facebook.php:766
 #: ../../addon.old/fbpost/fbpost.php:264
 msgid "App-ID / API-Key"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:767 ../../addon/fbpost/fbpost.php:265
+#: ../../addon/facebook/facebook.php:769 ../../addon/fbpost/fbpost.php:320
 #: ../../addon.old/facebook/facebook.php:767
 #: ../../addon.old/fbpost/fbpost.php:265
 msgid "Application secret"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:768
+#: ../../addon/facebook/facebook.php:770
 #: ../../addon.old/facebook/facebook.php:768
 #, php-format
 msgid "Polling Interval in minutes (minimum %1$s minutes)"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:769
+#: ../../addon/facebook/facebook.php:771
 #: ../../addon.old/facebook/facebook.php:769
 msgid ""
 "Synchronize comments (no comments on Facebook are missed, at the cost of "
 "increased system load)"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:773
+#: ../../addon/facebook/facebook.php:775
 #: ../../addon.old/facebook/facebook.php:773
 msgid "Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:777
+#: ../../addon/facebook/facebook.php:779
 #: ../../addon.old/facebook/facebook.php:777
 msgid "Real-Time Updates are activated."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:778
+#: ../../addon/facebook/facebook.php:780
 #: ../../addon.old/facebook/facebook.php:778
 msgid "Deactivate Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:780
+#: ../../addon/facebook/facebook.php:782
 #: ../../addon.old/facebook/facebook.php:780
 msgid "Real-Time Updates not activated."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:780
+#: ../../addon/facebook/facebook.php:782
 #: ../../addon.old/facebook/facebook.php:780
 msgid "Activate Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:799 ../../addon/fbpost/fbpost.php:282
+#: ../../addon/facebook/facebook.php:801 ../../addon/fbpost/fbpost.php:337
 #: ../../addon/dav/friendica/layout.fnk.php:361
 #: ../../addon.old/facebook/facebook.php:799
 #: ../../addon.old/fbpost/fbpost.php:282
@@ -5108,13 +5248,13 @@ msgstr ""
 msgid "The new values have been saved."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:823 ../../addon/fbpost/fbpost.php:301
+#: ../../addon/facebook/facebook.php:825 ../../addon/fbpost/fbpost.php:356
 #: ../../addon.old/facebook/facebook.php:823
 #: ../../addon.old/fbpost/fbpost.php:301
 msgid "Post to Facebook"
 msgstr "放在Facebook"
 
-#: ../../addon/facebook/facebook.php:921 ../../addon/fbpost/fbpost.php:399
+#: ../../addon/facebook/facebook.php:923 ../../addon/fbpost/fbpost.php:483
 #: ../../addon.old/facebook/facebook.php:921
 #: ../../addon.old/fbpost/fbpost.php:399
 msgid ""
@@ -5122,31 +5262,31 @@ msgid ""
 "conflict."
 msgstr "发送到Facebook取消由于多网络准许矛盾。"
 
-#: ../../addon/facebook/facebook.php:1149 ../../addon/fbpost/fbpost.php:610
+#: ../../addon/facebook/facebook.php:1151 ../../addon/fbpost/fbpost.php:762
 #: ../../addon.old/facebook/facebook.php:1149
 #: ../../addon.old/fbpost/fbpost.php:610
 msgid "View on Friendica"
 msgstr "看在Friendica"
 
-#: ../../addon/facebook/facebook.php:1182 ../../addon/fbpost/fbpost.php:643
+#: ../../addon/facebook/facebook.php:1184 ../../addon/fbpost/fbpost.php:799
 #: ../../addon.old/facebook/facebook.php:1182
 #: ../../addon.old/fbpost/fbpost.php:643
 msgid "Facebook post failed. Queued for retry."
 msgstr "Facebook发送失败了。排队着待再试。"
 
-#: ../../addon/facebook/facebook.php:1222 ../../addon/fbpost/fbpost.php:683
+#: ../../addon/facebook/facebook.php:1224 ../../addon/fbpost/fbpost.php:839
 #: ../../addon.old/facebook/facebook.php:1222
 #: ../../addon.old/fbpost/fbpost.php:683
 msgid "Your Facebook connection became invalid. Please Re-authenticate."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1223 ../../addon/fbpost/fbpost.php:684
+#: ../../addon/facebook/facebook.php:1225 ../../addon/fbpost/fbpost.php:840
 #: ../../addon.old/facebook/facebook.php:1223
 #: ../../addon.old/fbpost/fbpost.php:684
 msgid "Facebook connection became invalid"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1224 ../../addon/fbpost/fbpost.php:685
+#: ../../addon/facebook/facebook.php:1226 ../../addon/fbpost/fbpost.php:841
 #: ../../addon.old/facebook/facebook.php:1224
 #: ../../addon.old/fbpost/fbpost.php:685
 #, php-format
@@ -5171,59 +5311,76 @@ msgstr ""
 msgid "Automatically follow any StatusNet followers/mentioners"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:260
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:351
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:260
 msgid "Lifetime of the cache (in hours)"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:265
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:356
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:265
 msgid "Cache Statistics"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:268
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:359
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:268
 msgid "Number of items"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:270
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:361
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:270
 msgid "Size of the cache"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:272
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:363
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:272
 msgid "Delete the whole cache"
 msgstr ""
 
-#: ../../addon/fbpost/fbpost.php:172 ../../addon.old/fbpost/fbpost.php:172
+#: ../../addon/fbpost/fbpost.php:183 ../../addon.old/fbpost/fbpost.php:172
 msgid "Facebook Post disabled"
 msgstr ""
 
-#: ../../addon/fbpost/fbpost.php:199 ../../addon.old/fbpost/fbpost.php:199
+#: ../../addon/fbpost/fbpost.php:210 ../../addon.old/fbpost/fbpost.php:199
 msgid "Facebook Post"
 msgstr ""
 
-#: ../../addon/fbpost/fbpost.php:205 ../../addon.old/fbpost/fbpost.php:205
+#: ../../addon/fbpost/fbpost.php:216 ../../addon.old/fbpost/fbpost.php:205
 msgid "Install Facebook Post connector for this account."
 msgstr ""
 
-#: ../../addon/fbpost/fbpost.php:212 ../../addon.old/fbpost/fbpost.php:212
+#: ../../addon/fbpost/fbpost.php:223 ../../addon.old/fbpost/fbpost.php:212
 msgid "Remove Facebook Post connector"
 msgstr ""
 
-#: ../../addon/fbpost/fbpost.php:240 ../../addon.old/fbpost/fbpost.php:240
+#: ../../addon/fbpost/fbpost.php:239
+msgid "Suppress \"View on friendica\""
+msgstr ""
+
+#: ../../addon/fbpost/fbpost.php:243
+msgid "Mirror wall posts from facebook to friendica."
+msgstr ""
+
+#: ../../addon/fbpost/fbpost.php:253
+msgid "Post to page/group:"
+msgstr ""
+
+#: ../../addon/fbpost/fbpost.php:295 ../../addon.old/fbpost/fbpost.php:240
 msgid "Facebook Post Settings"
 msgstr ""
 
-#: ../../addon/widgets/widget_like.php:58
+#: ../../addon/fbpost/fbpost.php:375
+#, php-format
+msgid "%s:"
+msgstr ""
+
+#: ../../addon/widgets/widget_like.php:59
 #: ../../addon.old/widgets/widget_like.php:58
 #, php-format
 msgid "%d person likes this"
 msgid_plural "%d people like this"
 msgstr[0] "%d人喜欢这个"
 
-#: ../../addon/widgets/widget_like.php:61
+#: ../../addon/widgets/widget_like.php:62
 #: ../../addon.old/widgets/widget_like.php:61
 #, php-format
 msgid "%d person doesn't like this"
@@ -5235,15 +5392,15 @@ msgstr[0] "%d人不喜欢这个"
 msgid "Get added to this list!"
 msgstr ""
 
-#: ../../addon/widgets/widgets.php:56 ../../addon.old/widgets/widgets.php:56
+#: ../../addon/widgets/widgets.php:57 ../../addon.old/widgets/widgets.php:56
 msgid "Generate new key"
 msgstr "造成新钥匙"
 
-#: ../../addon/widgets/widgets.php:59 ../../addon.old/widgets/widgets.php:59
+#: ../../addon/widgets/widgets.php:60 ../../addon.old/widgets/widgets.php:59
 msgid "Widgets key"
 msgstr "小窗口钥匙"
 
-#: ../../addon/widgets/widgets.php:61 ../../addon.old/widgets/widgets.php:61
+#: ../../addon/widgets/widgets.php:62 ../../addon.old/widgets/widgets.php:61
 msgid "Widgets available"
 msgstr "可用的小窗口"
 
@@ -5437,27 +5594,27 @@ msgstr ""
 
 #: ../../addon/yourls/yourls.php:55 ../../addon.old/yourls/yourls.php:55
 msgid "YourLS Settings"
-msgstr ""
+msgstr "YourLS配置"
 
 #: ../../addon/yourls/yourls.php:57 ../../addon.old/yourls/yourls.php:57
 msgid "URL: http://"
-msgstr ""
+msgstr "URL: http://"
 
 #: ../../addon/yourls/yourls.php:62 ../../addon.old/yourls/yourls.php:62
 msgid "Username:"
-msgstr ""
+msgstr "用户名:"
 
 #: ../../addon/yourls/yourls.php:67 ../../addon.old/yourls/yourls.php:67
 msgid "Password:"
-msgstr ""
+msgstr "密码:"
 
 #: ../../addon/yourls/yourls.php:72 ../../addon.old/yourls/yourls.php:72
 msgid "Use SSL "
-msgstr ""
+msgstr "用SSL"
 
 #: ../../addon/yourls/yourls.php:92 ../../addon.old/yourls/yourls.php:92
 msgid "yourls Settings saved."
-msgstr ""
+msgstr "yourls配置保存了。"
 
 #: ../../addon/ljpost/ljpost.php:39 ../../addon.old/ljpost/ljpost.php:39
 msgid "Post to LiveJournal"
@@ -5507,7 +5664,7 @@ msgstr ""
 
 #: ../../addon/nsfw/nsfw.php:89 ../../addon.old/nsfw/nsfw.php:89
 msgid "Use /expression/ to provide regular expressions"
-msgstr ""
+msgstr "用/<i>表达式</i>/为输入正则表达式"
 
 #: ../../addon/nsfw/nsfw.php:105 ../../addon.old/nsfw/nsfw.php:105
 msgid "NSFW Settings saved."
@@ -5519,12 +5676,12 @@ msgid "%s - Click to open/close"
 msgstr "%s - 点击为打开/关闭"
 
 #: ../../addon/page/page.php:62 ../../addon/page/page.php:92
-#: ../../addon/forumlist/forumlist.php:60 ../../addon.old/page/page.php:62
+#: ../../addon/forumlist/forumlist.php:64 ../../addon.old/page/page.php:62
 #: ../../addon.old/page/page.php:92 ../../addon.old/forumlist/forumlist.php:60
 msgid "Forums"
 msgstr ""
 
-#: ../../addon/page/page.php:130 ../../addon/forumlist/forumlist.php:94
+#: ../../addon/page/page.php:130 ../../addon/forumlist/forumlist.php:98
 #: ../../addon.old/page/page.php:130
 #: ../../addon.old/forumlist/forumlist.php:94
 msgid "Forums:"
@@ -5558,12 +5715,13 @@ msgstr ""
 msgid "Enable Planets Plugin"
 msgstr ""
 
+#: ../../addon/forumdirectory/forumdirectory.php:22
+msgid "Forum Directory"
+msgstr ""
+
 #: ../../addon/communityhome/communityhome.php:28
-#: ../../addon/communityhome/communityhome.php:34
-#: ../../addon/communityhome/twillingham/communityhome.php:28
-#: ../../addon/communityhome/twillingham/communityhome.php:34
-#: ../../include/nav.php:64 ../../boot.php:947
-#: ../../addon.old/communityhome/communityhome.php:28
+#: ../../addon/communityhome/communityhome.php:34 ../../include/nav.php:64
+#: ../../boot.php:984 ../../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
@@ -5571,38 +5729,35 @@ msgid "Login"
 msgstr "登录"
 
 #: ../../addon/communityhome/communityhome.php:29
-#: ../../addon/communityhome/twillingham/communityhome.php:29
 #: ../../addon.old/communityhome/communityhome.php:29
 #: ../../addon.old/communityhome/twillingham/communityhome.php:29
 msgid "OpenID"
 msgstr "OpenID"
 
-#: ../../addon/communityhome/communityhome.php:38
-#: ../../addon/communityhome/twillingham/communityhome.php:38
+#: ../../addon/communityhome/communityhome.php:39
 #: ../../addon.old/communityhome/communityhome.php:38
 #: ../../addon.old/communityhome/twillingham/communityhome.php:38
 msgid "Latest users"
 msgstr ""
 
-#: ../../addon/communityhome/communityhome.php:81
-#: ../../addon/communityhome/twillingham/communityhome.php:81
+#: ../../addon/communityhome/communityhome.php:84
 #: ../../addon.old/communityhome/communityhome.php:81
 #: ../../addon.old/communityhome/twillingham/communityhome.php:81
 msgid "Most active users"
 msgstr "最积极用户"
 
-#: ../../addon/communityhome/communityhome.php:98
+#: ../../addon/communityhome/communityhome.php:102
 #: ../../addon.old/communityhome/communityhome.php:98
 msgid "Latest photos"
 msgstr ""
 
-#: ../../addon/communityhome/communityhome.php:133
+#: ../../addon/communityhome/communityhome.php:141
 #: ../../addon.old/communityhome/communityhome.php:133
 msgid "Latest likes"
 msgstr ""
 
-#: ../../addon/communityhome/communityhome.php:155
-#: ../../view/theme/diabook/theme.php:493 ../../include/text.php:1440
+#: ../../addon/communityhome/communityhome.php:163
+#: ../../view/theme/diabook/theme.php:456 ../../include/text.php:1497
 #: ../../include/conversation.php:117 ../../include/conversation.php:245
 #: ../../addon.old/communityhome/communityhome.php:155
 msgid "event"
@@ -5756,7 +5911,7 @@ msgstr ""
 #: ../../addon/dav/common/wdcal_edit.inc.php:254
 #: ../../addon/dav/common/wdcal_edit.inc.php:270
 #: ../../addon/dav/common/wdcal_edit.inc.php:293
-#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:922
+#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:976
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:231
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:254
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:270
@@ -5767,7 +5922,7 @@ msgstr "星期天"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:235
 #: ../../addon/dav/common/wdcal_edit.inc.php:274
-#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:922
+#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:976
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:235
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:274
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:308
@@ -5775,35 +5930,35 @@ msgid "Monday"
 msgstr "星期一"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:238
-#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:922
+#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:976
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:238
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:277
 msgid "Tuesday"
 msgstr "星期二"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:241
-#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:922
+#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:976
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:241
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:280
 msgid "Wednesday"
 msgstr "星期三"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:244
-#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:922
+#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:976
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:244
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:283
 msgid "Thursday"
 msgstr "星期四"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:247
-#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:922
+#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:976
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:247
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:286
 msgid "Friday"
 msgstr "星期五"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:250
-#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:922
+#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:976
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:250
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:289
 msgid "Saturday"
@@ -6170,8 +6325,8 @@ msgid "Extended calendar with CalDAV-support"
 msgstr ""
 
 #: ../../addon/dav/friendica/main.php:279
-#: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:464
-#: ../../include/enotify.php:28 ../../include/notifier.php:774
+#: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:468
+#: ../../include/enotify.php:28 ../../include/notifier.php:781
 #: ../../addon.old/dav/friendica/main.php:279
 #: ../../addon.old/dav/friendica/main.php:280
 msgid "noreply"
@@ -6420,41 +6575,43 @@ msgstr ""
 msgid "Post to dreamwidth by default"
 msgstr ""
 
-#: ../../addon/remote_permissions/remote_permissions.php:44
+#: ../../addon/remote_permissions/remote_permissions.php:45
 msgid "Remote Permissions Settings"
 msgstr ""
 
-#: ../../addon/remote_permissions/remote_permissions.php:45
+#: ../../addon/remote_permissions/remote_permissions.php:46
 msgid ""
 "Allow recipients of your private posts to see the other recipients of the "
 "posts"
 msgstr ""
 
-#: ../../addon/remote_permissions/remote_permissions.php:57
+#: ../../addon/remote_permissions/remote_permissions.php:58
 msgid "Remote Permissions settings updated."
 msgstr ""
 
-#: ../../addon/remote_permissions/remote_permissions.php:177
+#: ../../addon/remote_permissions/remote_permissions.php:178
 msgid "Visible to"
 msgstr ""
 
-#: ../../addon/remote_permissions/remote_permissions.php:177
+#: ../../addon/remote_permissions/remote_permissions.php:178
 msgid "may only be a partial list"
 msgstr ""
 
-#: ../../addon/remote_permissions/remote_permissions.php:196
+#: ../../addon/remote_permissions/remote_permissions.php:197
+#: ../../addon/altpager/altpager.php:99
 msgid "Global"
 msgstr ""
 
-#: ../../addon/remote_permissions/remote_permissions.php:196
+#: ../../addon/remote_permissions/remote_permissions.php:197
 msgid "The posts of every user on this server show the post recipients"
 msgstr ""
 
-#: ../../addon/remote_permissions/remote_permissions.php:197
+#: ../../addon/remote_permissions/remote_permissions.php:198
+#: ../../addon/altpager/altpager.php:100
 msgid "Individual"
 msgstr ""
 
-#: ../../addon/remote_permissions/remote_permissions.php:197
+#: ../../addon/remote_permissions/remote_permissions.php:198
 msgid "Each user chooses whether his/her posts show the post recipients"
 msgstr ""
 
@@ -6525,57 +6682,57 @@ msgstr "在这儿放文件为上传"
 msgid "Failed"
 msgstr "失败"
 
-#: ../../addon/js_upload/js_upload.php:297
+#: ../../addon/js_upload/js_upload.php:303
 #: ../../addon.old/js_upload/js_upload.php:297
 msgid "No files were uploaded."
 msgstr "没有文件上传。"
 
-#: ../../addon/js_upload/js_upload.php:303
+#: ../../addon/js_upload/js_upload.php:309
 #: ../../addon.old/js_upload/js_upload.php:303
 msgid "Uploaded file is empty"
 msgstr "上传的文件空的"
 
-#: ../../addon/js_upload/js_upload.php:326
+#: ../../addon/js_upload/js_upload.php:332
 #: ../../addon.old/js_upload/js_upload.php:326
 msgid "File has an invalid extension, it should be one of "
 msgstr "文件扩展名无效的,应该是这些一个:"
 
-#: ../../addon/js_upload/js_upload.php:337
+#: ../../addon/js_upload/js_upload.php:343
 #: ../../addon.old/js_upload/js_upload.php:337
 msgid "Upload was cancelled, or server error encountered"
 msgstr "上传注销了,或相遇服务器错误"
 
-#: ../../addon/forumlist/forumlist.php:63
+#: ../../addon/forumlist/forumlist.php:67
 #: ../../addon.old/forumlist/forumlist.php:63
 msgid "show/hide"
 msgstr ""
 
-#: ../../addon/forumlist/forumlist.php:77
+#: ../../addon/forumlist/forumlist.php:81
 #: ../../addon.old/forumlist/forumlist.php:77
 msgid "No forum subscriptions"
 msgstr ""
 
-#: ../../addon/forumlist/forumlist.php:131
+#: ../../addon/forumlist/forumlist.php:134
 #: ../../addon.old/forumlist/forumlist.php:131
 msgid "Forumlist settings updated."
 msgstr ""
 
-#: ../../addon/forumlist/forumlist.php:159
+#: ../../addon/forumlist/forumlist.php:162
 #: ../../addon.old/forumlist/forumlist.php:159
 msgid "Forumlist Settings"
 msgstr ""
 
-#: ../../addon/forumlist/forumlist.php:161
+#: ../../addon/forumlist/forumlist.php:164
 #: ../../addon.old/forumlist/forumlist.php:161
 msgid "Randomise forum list"
 msgstr ""
 
-#: ../../addon/forumlist/forumlist.php:164
+#: ../../addon/forumlist/forumlist.php:167
 #: ../../addon.old/forumlist/forumlist.php:164
 msgid "Show forums on profile page"
 msgstr ""
 
-#: ../../addon/forumlist/forumlist.php:167
+#: ../../addon/forumlist/forumlist.php:170
 #: ../../addon.old/forumlist/forumlist.php:167
 msgid "Show forums on network page"
 msgstr ""
@@ -6684,20 +6841,20 @@ msgstr ""
 
 #: ../../addon/blockem/blockem.php:51 ../../addon.old/blockem/blockem.php:51
 msgid "\"Blockem\" Settings"
-msgstr ""
+msgstr "「Blockem」配置"
 
 #: ../../addon/blockem/blockem.php:53 ../../addon.old/blockem/blockem.php:53
 msgid "Comma separated profile URLS to block"
-msgstr ""
+msgstr "逗号分简介URL为栏"
 
 #: ../../addon/blockem/blockem.php:70 ../../addon.old/blockem/blockem.php:70
 msgid "BLOCKEM Settings saved."
-msgstr ""
+msgstr "「Blockem」配置保存了。"
 
 #: ../../addon/blockem/blockem.php:105 ../../addon.old/blockem/blockem.php:105
 #, php-format
 msgid "Blocked %s - Click to open/close"
-msgstr ""
+msgstr "%s拦了-点击为开关"
 
 #: ../../addon/blockem/blockem.php:160 ../../addon.old/blockem/blockem.php:160
 msgid "Unblock Author"
@@ -6771,10 +6928,7 @@ msgid "The default zoom level. (1:world, 18:highest)"
 msgstr ""
 
 #: ../../addon/group_text/group_text.php:46
-#: ../../addon/editplain/editplain.php:46
-#: ../../addon.old/group_text/group_text.php:46
-#: ../../addon.old/editplain/editplain.php:46
-msgid "Editplain settings updated."
+msgid "Group Text settings updated."
 msgstr ""
 
 #: ../../addon/group_text/group_text.php:76
@@ -6905,16 +7059,24 @@ msgstr ""
 msgid "Altpager settings updated."
 msgstr ""
 
-#: ../../addon/altpager/altpager.php:79
+#: ../../addon/altpager/altpager.php:83
 #: ../../addon.old/altpager/altpager.php:79
 msgid "Alternate Pagination Setting"
 msgstr ""
 
-#: ../../addon/altpager/altpager.php:81
+#: ../../addon/altpager/altpager.php:85
 #: ../../addon.old/altpager/altpager.php:81
 msgid "Use links to \"newer\" and \"older\" pages in place of page numbers?"
 msgstr ""
 
+#: ../../addon/altpager/altpager.php:99
+msgid "Force global use of the alternate pager"
+msgstr ""
+
+#: ../../addon/altpager/altpager.php:100
+msgid "Each user chooses whether to use the alternate pager"
+msgstr ""
+
 #: ../../addon/mathjax/mathjax.php:37 ../../addon.old/mathjax/mathjax.php:37
 msgid ""
 "The MathJax addon renders mathematical formulae written using the LaTeX "
@@ -6926,16 +7088,22 @@ msgstr ""
 msgid "Use the MathJax renderer"
 msgstr ""
 
-#: ../../addon/mathjax/mathjax.php:74 ../../addon.old/mathjax/mathjax.php:74
+#: ../../addon/mathjax/mathjax.php:75 ../../addon.old/mathjax/mathjax.php:74
 msgid "MathJax Base URL"
 msgstr ""
 
-#: ../../addon/mathjax/mathjax.php:74 ../../addon.old/mathjax/mathjax.php:74
+#: ../../addon/mathjax/mathjax.php:75 ../../addon.old/mathjax/mathjax.php:74
 msgid ""
 "The URL for the javascript file that should be included to use MathJax. Can "
 "be either the MathJax CDN or another installation of MathJax."
 msgstr ""
 
+#: ../../addon/editplain/editplain.php:46
+#: ../../addon.old/group_text/group_text.php:46
+#: ../../addon.old/editplain/editplain.php:46
+msgid "Editplain settings updated."
+msgstr ""
+
 #: ../../addon/editplain/editplain.php:76
 #: ../../addon.old/editplain/editplain.php:76
 msgid "Editplain Settings"
@@ -6996,7 +7164,7 @@ msgstr "\"pageheader"
 #: ../../addon/pageheader/pageheader.php:68
 #: ../../addon.old/pageheader/pageheader.php:68
 msgid "pageheader Settings saved."
-msgstr ""
+msgstr "pageHeader配置保存了。"
 
 #: ../../addon/ijpost/ijpost.php:39 ../../addon.old/ijpost/ijpost.php:39
 msgid "Post to Insanejournal"
@@ -7092,39 +7260,39 @@ msgstr ""
 msgid "View Source"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:134
+#: ../../addon/statusnet/statusnet.php:138
 #: ../../addon.old/statusnet/statusnet.php:134
 msgid "Post to StatusNet"
 msgstr "发送到StatusNet"
 
-#: ../../addon/statusnet/statusnet.php:176
+#: ../../addon/statusnet/statusnet.php:180
 #: ../../addon.old/statusnet/statusnet.php:176
 msgid ""
 "Please contact your site administrator.<br />The provided API URL is not "
 "valid."
 msgstr "请联系您的网站行政人员。<br />提供的API URL无效。"
 
-#: ../../addon/statusnet/statusnet.php:204
+#: ../../addon/statusnet/statusnet.php:208
 #: ../../addon.old/statusnet/statusnet.php:204
 msgid "We could not contact the StatusNet API with the Path you entered."
 msgstr "我们不能联系StatusNet API在您输入的路径。"
 
-#: ../../addon/statusnet/statusnet.php:232
+#: ../../addon/statusnet/statusnet.php:238
 #: ../../addon.old/statusnet/statusnet.php:232
 msgid "StatusNet settings updated."
 msgstr "StatusNet设置更新了。"
 
-#: ../../addon/statusnet/statusnet.php:257
+#: ../../addon/statusnet/statusnet.php:269
 #: ../../addon.old/statusnet/statusnet.php:257
 msgid "StatusNet Posting Settings"
 msgstr "StatusNet发送设置"
 
-#: ../../addon/statusnet/statusnet.php:271
+#: ../../addon/statusnet/statusnet.php:283
 #: ../../addon.old/statusnet/statusnet.php:271
 msgid "Globally Available StatusNet OAuthKeys"
 msgstr "综合可用的StatusNet OAuthKeys"
 
-#: ../../addon/statusnet/statusnet.php:272
+#: ../../addon/statusnet/statusnet.php:284
 #: ../../addon.old/statusnet/statusnet.php:272
 msgid ""
 "There are preconfigured OAuth key pairs for some StatusNet servers "
@@ -7132,12 +7300,12 @@ msgid ""
 "not feel free to connect to any other StatusNet instance (see below)."
 msgstr "有已经装配的OAuth钥匙双于有的StatusNet服务器可用。如果您用那些之一,请用那个。否则随便连接任何别的StatusNet(看下)。"
 
-#: ../../addon/statusnet/statusnet.php:280
+#: ../../addon/statusnet/statusnet.php:292
 #: ../../addon.old/statusnet/statusnet.php:280
 msgid "Provide your own OAuth Credentials"
 msgstr "提供您自己的OAuth证件"
 
-#: ../../addon/statusnet/statusnet.php:281
+#: ../../addon/statusnet/statusnet.php:293
 #: ../../addon.old/statusnet/statusnet.php:281
 msgid ""
 "No consumer key pair for StatusNet found. Register your Friendica Account as"
@@ -7147,22 +7315,22 @@ msgid ""
 "Friendica installation at your favorited StatusNet installation."
 msgstr "找不到「consumer key」双为StatusNet。注册您Friendica账户当「desktop client」在您的StatusNet账户,粘贴「consumer key」双这儿和输入API基础根。<br />您登记您的OAuth钥匙双前问行政人员已经有没有钥匙双为这个Friendica安装在您最喜欢的StatusNet安装。"
 
-#: ../../addon/statusnet/statusnet.php:283
+#: ../../addon/statusnet/statusnet.php:295
 #: ../../addon.old/statusnet/statusnet.php:283
 msgid "OAuth Consumer Key"
 msgstr "Oauth消费者钥匙"
 
-#: ../../addon/statusnet/statusnet.php:286
+#: ../../addon/statusnet/statusnet.php:298
 #: ../../addon.old/statusnet/statusnet.php:286
 msgid "OAuth Consumer Secret"
 msgstr "Oauth消费者密码"
 
-#: ../../addon/statusnet/statusnet.php:289
+#: ../../addon/statusnet/statusnet.php:301
 #: ../../addon.old/statusnet/statusnet.php:289
 msgid "Base API Path (remember the trailing /)"
 msgstr "基础API地址(注意最后的/)"
 
-#: ../../addon/statusnet/statusnet.php:310
+#: ../../addon/statusnet/statusnet.php:322
 #: ../../addon.old/statusnet/statusnet.php:310
 msgid ""
 "To connect to your StatusNet account click the button below to get a "
@@ -7171,38 +7339,38 @@ msgid ""
 " to StatusNet."
 msgstr "为连接您的StatusNet账户点击下按钮得到安全密码从StatusNet您要在输入在下个栏和提交表单。只您的公开文章被送到StatusNet。"
 
-#: ../../addon/statusnet/statusnet.php:311
+#: ../../addon/statusnet/statusnet.php:323
 #: ../../addon.old/statusnet/statusnet.php:311
 msgid "Log in with StatusNet"
 msgstr "用StatusNet登记"
 
-#: ../../addon/statusnet/statusnet.php:313
+#: ../../addon/statusnet/statusnet.php:325
 #: ../../addon.old/statusnet/statusnet.php:313
 msgid "Copy the security code from StatusNet here"
 msgstr "复制安全密码从StatusNet这儿"
 
-#: ../../addon/statusnet/statusnet.php:319
+#: ../../addon/statusnet/statusnet.php:331
 #: ../../addon.old/statusnet/statusnet.php:319
 msgid "Cancel Connection Process"
 msgstr "注销连接过程 "
 
-#: ../../addon/statusnet/statusnet.php:321
+#: ../../addon/statusnet/statusnet.php:333
 #: ../../addon.old/statusnet/statusnet.php:321
 msgid "Current StatusNet API is"
 msgstr "现在StatusNet API是"
 
-#: ../../addon/statusnet/statusnet.php:322
+#: ../../addon/statusnet/statusnet.php:334
 #: ../../addon.old/statusnet/statusnet.php:322
 msgid "Cancel StatusNet Connection"
 msgstr "注销StatusNet连接"
 
-#: ../../addon/statusnet/statusnet.php:333 ../../addon/twitter/twitter.php:189
+#: ../../addon/statusnet/statusnet.php:345 ../../addon/twitter/twitter.php:200
 #: ../../addon.old/statusnet/statusnet.php:333
 #: ../../addon.old/twitter/twitter.php:189
 msgid "Currently connected to: "
 msgstr "现在连接到:"
 
-#: ../../addon/statusnet/statusnet.php:334
+#: ../../addon/statusnet/statusnet.php:346
 #: ../../addon.old/statusnet/statusnet.php:334
 msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
@@ -7210,7 +7378,7 @@ msgid ""
 "for every posting separately in the posting options when writing the entry."
 msgstr "如果使可用的都您<strong>公开的</strong>文章会被发送到有关的StatusNet账户。您会选择默认地这样做(这儿)或个文章分开地写字时候选择在文章设置。"
 
-#: ../../addon/statusnet/statusnet.php:336
+#: ../../addon/statusnet/statusnet.php:348
 #: ../../addon.old/statusnet/statusnet.php:336
 msgid ""
 "<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
@@ -7219,28 +7387,37 @@ msgid ""
 "informing the visitor that the access to your profile has been restricted."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:339
+#: ../../addon/statusnet/statusnet.php:351
 #: ../../addon.old/statusnet/statusnet.php:339
 msgid "Allow posting to StatusNet"
 msgstr "许放在StatusNet"
 
-#: ../../addon/statusnet/statusnet.php:342
+#: ../../addon/statusnet/statusnet.php:354
 #: ../../addon.old/statusnet/statusnet.php:342
 msgid "Send public postings to StatusNet by default"
 msgstr "默认发送公开文章在StatusNet"
 
-#: ../../addon/statusnet/statusnet.php:345
+#: ../../addon/statusnet/statusnet.php:358
+msgid ""
+"Mirror all posts from statusnet that are no replies or repeated messages"
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:362
+msgid "Shortening method that optimizes the post"
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:366
 #: ../../addon.old/statusnet/statusnet.php:345
 msgid "Send linked #-tags and @-names to StatusNet"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:350 ../../addon/twitter/twitter.php:206
+#: ../../addon/statusnet/statusnet.php:371 ../../addon/twitter/twitter.php:226
 #: ../../addon.old/statusnet/statusnet.php:350
 #: ../../addon.old/twitter/twitter.php:206
 msgid "Clear OAuth configuration"
 msgstr "清理出OAuth设置"
 
-#: ../../addon/statusnet/statusnet.php:568
+#: ../../addon/statusnet/statusnet.php:745
 #: ../../addon.old/statusnet/statusnet.php:568
 msgid "API URL"
 msgstr "API URL"
@@ -7250,30 +7427,42 @@ msgstr "API URL"
 msgid "Infinite Improbability Drive"
 msgstr ""
 
-#: ../../addon/tumblr/tumblr.php:36 ../../addon.old/tumblr/tumblr.php:36
+#: ../../addon/tumblr/tumblr.php:144
+msgid "You are now authenticated to tumblr."
+msgstr ""
+
+#: ../../addon/tumblr/tumblr.php:145
+msgid "return to the connector page"
+msgstr ""
+
+#: ../../addon/tumblr/tumblr.php:158 ../../addon.old/tumblr/tumblr.php:36
 msgid "Post to Tumblr"
 msgstr "发送到Tumblr"
 
-#: ../../addon/tumblr/tumblr.php:67 ../../addon.old/tumblr/tumblr.php:67
+#: ../../addon/tumblr/tumblr.php:185 ../../addon.old/tumblr/tumblr.php:67
 msgid "Tumblr Post Settings"
 msgstr "Tumblr发送设置"
 
-#: ../../addon/tumblr/tumblr.php:69 ../../addon.old/tumblr/tumblr.php:69
+#: ../../addon/tumblr/tumblr.php:188
+msgid "(Re-)Authenticate your tumblr page"
+msgstr ""
+
+#: ../../addon/tumblr/tumblr.php:192 ../../addon.old/tumblr/tumblr.php:69
 msgid "Enable Tumblr Post Plugin"
 msgstr "使Tumblr发送插件能够"
 
-#: ../../addon/tumblr/tumblr.php:74 ../../addon.old/tumblr/tumblr.php:74
-msgid "Tumblr login"
-msgstr "Tumblr登记名"
-
-#: ../../addon/tumblr/tumblr.php:79 ../../addon.old/tumblr/tumblr.php:79
-msgid "Tumblr password"
-msgstr "Tumblr密码"
-
-#: ../../addon/tumblr/tumblr.php:84 ../../addon.old/tumblr/tumblr.php:84
+#: ../../addon/tumblr/tumblr.php:197 ../../addon.old/tumblr/tumblr.php:84
 msgid "Post to Tumblr by default"
 msgstr "默认地给Tumblr发送"
 
+#: ../../addon/tumblr/tumblr.php:217
+msgid "Post to page:"
+msgstr ""
+
+#: ../../addon/tumblr/tumblr.php:228
+msgid "You are not authenticated to tumblr"
+msgstr ""
+
 #: ../../addon/numfriends/numfriends.php:46
 #: ../../addon.old/numfriends/numfriends.php:46
 msgid "Numfriends settings updated."
@@ -7412,25 +7601,25 @@ msgstr " 显示选择性退出cookie按钮?"
 msgid "Asynchronous tracking"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:73 ../../addon.old/twitter/twitter.php:73
+#: ../../addon/twitter/twitter.php:77 ../../addon.old/twitter/twitter.php:73
 msgid "Post to Twitter"
 msgstr "发送到在Twitter"
 
-#: ../../addon/twitter/twitter.php:122 ../../addon.old/twitter/twitter.php:122
+#: ../../addon/twitter/twitter.php:129 ../../addon.old/twitter/twitter.php:122
 msgid "Twitter settings updated."
 msgstr "Twitter设置更新了。"
 
-#: ../../addon/twitter/twitter.php:146 ../../addon.old/twitter/twitter.php:146
+#: ../../addon/twitter/twitter.php:157 ../../addon.old/twitter/twitter.php:146
 msgid "Twitter Posting Settings"
 msgstr "Twitter发送设置"
 
-#: ../../addon/twitter/twitter.php:153 ../../addon.old/twitter/twitter.php:153
+#: ../../addon/twitter/twitter.php:164 ../../addon.old/twitter/twitter.php:153
 msgid ""
 "No consumer key pair for Twitter found. Please contact your site "
 "administrator."
 msgstr "找不到Twitter的消费钥匙双。请联系您的网页行政人员。"
 
-#: ../../addon/twitter/twitter.php:172 ../../addon.old/twitter/twitter.php:172
+#: ../../addon/twitter/twitter.php:183 ../../addon.old/twitter/twitter.php:172
 msgid ""
 "At this Friendica instance the Twitter plugin was enabled but you have not "
 "yet connected your account to your Twitter account. To do so click the "
@@ -7439,22 +7628,22 @@ msgid ""
 " be posted to Twitter."
 msgstr "在这个Friendica网站使Twitter插件可用的可您还没有把您的账户和您Twitter账户连通。为这做点击下边的按钮得到密码从Twitter您要粘贴在下边的输入框和提交。只您的<strong>公开</strong>文章被发送到Twitter。"
 
-#: ../../addon/twitter/twitter.php:173 ../../addon.old/twitter/twitter.php:173
+#: ../../addon/twitter/twitter.php:184 ../../addon.old/twitter/twitter.php:173
 msgid "Log in with Twitter"
 msgstr "用Twitter登记"
 
-#: ../../addon/twitter/twitter.php:175 ../../addon.old/twitter/twitter.php:175
+#: ../../addon/twitter/twitter.php:186 ../../addon.old/twitter/twitter.php:175
 msgid "Copy the PIN from Twitter here"
 msgstr "复制Twitter密码这儿"
 
-#: ../../addon/twitter/twitter.php:190 ../../addon.old/twitter/twitter.php:190
+#: ../../addon/twitter/twitter.php:201 ../../addon.old/twitter/twitter.php:190
 msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
 "associated Twitter account. You can choose to do so by default (here) or for"
 " every posting separately in the posting options when writing the entry."
 msgstr "如果使可用的都您<strong>公开的</strong>文章会被发送到有关的Twitter账户。您会选择默认地这样做(这儿)或个文章分开地写字时候选择在文章设置。"
 
-#: ../../addon/twitter/twitter.php:192 ../../addon.old/twitter/twitter.php:192
+#: ../../addon/twitter/twitter.php:203 ../../addon.old/twitter/twitter.php:192
 msgid ""
 "<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
 "details from unknown viewers?</em>) the link potentially included in public "
@@ -7462,23 +7651,31 @@ msgid ""
 "the visitor that the access to your profile has been restricted."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:195 ../../addon.old/twitter/twitter.php:195
+#: ../../addon/twitter/twitter.php:206 ../../addon.old/twitter/twitter.php:195
 msgid "Allow posting to Twitter"
 msgstr "允许发送到Twitter"
 
-#: ../../addon/twitter/twitter.php:198 ../../addon.old/twitter/twitter.php:198
+#: ../../addon/twitter/twitter.php:209 ../../addon.old/twitter/twitter.php:198
 msgid "Send public postings to Twitter by default"
 msgstr "默认地发送公开文章到Twitter"
 
-#: ../../addon/twitter/twitter.php:201 ../../addon.old/twitter/twitter.php:201
+#: ../../addon/twitter/twitter.php:213
+msgid "Mirror all posts from twitter that are no replies or retweets"
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:217
+msgid "Shortening method that optimizes the tweet"
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:221 ../../addon.old/twitter/twitter.php:201
 msgid "Send linked #-tags and @-names to Twitter"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:396 ../../addon.old/twitter/twitter.php:396
+#: ../../addon/twitter/twitter.php:556 ../../addon.old/twitter/twitter.php:396
 msgid "Consumer key"
 msgstr "钥匙(Consumer key)"
 
-#: ../../addon/twitter/twitter.php:397 ../../addon.old/twitter/twitter.php:397
+#: ../../addon/twitter/twitter.php:557 ../../addon.old/twitter/twitter.php:397
 msgid "Consumer secret"
 msgstr "密码(Consumer secret)"
 
@@ -7617,7 +7814,7 @@ msgid "Color scheme"
 msgstr ""
 
 #: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:49
-#: ../../include/nav.php:115
+#: ../../include/nav.php:116
 msgid "Your posts and conversations"
 msgstr "你的消息和交谈"
 
@@ -7646,107 +7843,107 @@ msgid "Your personal photos"
 msgstr "你私人的照片"
 
 #: ../../view/theme/diabook/theme.php:94
-#: ../../view/theme/diabook/theme.php:386
-#: ../../view/theme/diabook/theme.php:635
+#: ../../view/theme/diabook/theme.php:537
+#: ../../view/theme/diabook/theme.php:632
 #: ../../view/theme/diabook/config.php:163
 msgid "Community Pages"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:421
-#: ../../view/theme/diabook/theme.php:637
+#: ../../view/theme/diabook/theme.php:384
+#: ../../view/theme/diabook/theme.php:634
 #: ../../view/theme/diabook/config.php:165
 msgid "Community Profiles"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:442
-#: ../../view/theme/diabook/theme.php:642
+#: ../../view/theme/diabook/theme.php:405
+#: ../../view/theme/diabook/theme.php:639
 #: ../../view/theme/diabook/config.php:170
 msgid "Last users"
 msgstr "上次用户"
 
-#: ../../view/theme/diabook/theme.php:471
-#: ../../view/theme/diabook/theme.php:644
+#: ../../view/theme/diabook/theme.php:434
+#: ../../view/theme/diabook/theme.php:641
 #: ../../view/theme/diabook/config.php:172
 msgid "Last likes"
 msgstr "上次喜欢"
 
-#: ../../view/theme/diabook/theme.php:516
-#: ../../view/theme/diabook/theme.php:643
+#: ../../view/theme/diabook/theme.php:479
+#: ../../view/theme/diabook/theme.php:640
 #: ../../view/theme/diabook/config.php:171
 msgid "Last photos"
 msgstr "上次照片"
 
-#: ../../view/theme/diabook/theme.php:553
-#: ../../view/theme/diabook/theme.php:640
+#: ../../view/theme/diabook/theme.php:516
+#: ../../view/theme/diabook/theme.php:637
 #: ../../view/theme/diabook/config.php:168
 msgid "Find Friends"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:554
+#: ../../view/theme/diabook/theme.php:517
 msgid "Local Directory"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:556 ../../include/contact_widgets.php:35
+#: ../../view/theme/diabook/theme.php:519 ../../include/contact_widgets.php:35
 msgid "Similar Interests"
 msgstr "相似兴趣"
 
-#: ../../view/theme/diabook/theme.php:558 ../../include/contact_widgets.php:37
+#: ../../view/theme/diabook/theme.php:521 ../../include/contact_widgets.php:37
 msgid "Invite Friends"
 msgstr "邀请朋友们"
 
-#: ../../view/theme/diabook/theme.php:575
-#: ../../view/theme/diabook/theme.php:636
+#: ../../view/theme/diabook/theme.php:572
+#: ../../view/theme/diabook/theme.php:633
 #: ../../view/theme/diabook/config.php:164
 msgid "Earth Layers"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:580
+#: ../../view/theme/diabook/theme.php:577
 msgid "Set zoomfactor for Earth Layers"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:581
+#: ../../view/theme/diabook/theme.php:578
 #: ../../view/theme/diabook/config.php:161
 msgid "Set longitude (X) for Earth Layers"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:582
+#: ../../view/theme/diabook/theme.php:579
 #: ../../view/theme/diabook/config.php:162
 msgid "Set latitude (Y) for Earth Layers"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:595
-#: ../../view/theme/diabook/theme.php:638
+#: ../../view/theme/diabook/theme.php:592
+#: ../../view/theme/diabook/theme.php:635
 #: ../../view/theme/diabook/config.php:166
 msgid "Help or @NewHere ?"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:602
-#: ../../view/theme/diabook/theme.php:639
+#: ../../view/theme/diabook/theme.php:599
+#: ../../view/theme/diabook/theme.php:636
 #: ../../view/theme/diabook/config.php:167
 msgid "Connect Services"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:609
-#: ../../view/theme/diabook/theme.php:641
+#: ../../view/theme/diabook/theme.php:606
+#: ../../view/theme/diabook/theme.php:638
 msgid "Last Tweets"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:612
+#: ../../view/theme/diabook/theme.php:609
 #: ../../view/theme/diabook/config.php:159
 msgid "Set twitter search term"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:632
-#: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:288
+#: ../../view/theme/diabook/theme.php:629
+#: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:313
 msgid "don't show"
 msgstr "别著"
 
-#: ../../view/theme/diabook/theme.php:632
-#: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:287
+#: ../../view/theme/diabook/theme.php:629
+#: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:312
 msgid "show"
 msgstr "著"
 
-#: ../../view/theme/diabook/theme.php:633
+#: ../../view/theme/diabook/theme.php:630
 msgid "Show/hide boxes at right-hand column:"
 msgstr ""
 
@@ -7920,6 +8117,10 @@ msgstr "XMPP/IM"
 msgid "MySpace"
 msgstr "MySpace"
 
+#: ../../include/contact_selectors.php:87
+msgid "Google+"
+msgstr ""
+
 #: ../../include/profile_selectors.php:6
 msgid "Male"
 msgstr "男的"
@@ -8064,8 +8265,8 @@ msgstr "外遇"
 msgid "Sex Addict"
 msgstr "性交因成瘾者"
 
-#: ../../include/profile_selectors.php:42 ../../include/user.php:278
-#: ../../include/user.php:282
+#: ../../include/profile_selectors.php:42 ../../include/user.php:279
+#: ../../include/user.php:283
 msgid "Friends"
 msgstr "朋友"
 
@@ -8153,15 +8354,15 @@ msgstr "无所谓"
 msgid "Ask me"
 msgstr "问我"
 
-#: ../../include/event.php:20 ../../include/bb2diaspora.php:396
+#: ../../include/event.php:20 ../../include/bb2diaspora.php:399
 msgid "Starts:"
 msgstr "开始:"
 
-#: ../../include/event.php:30 ../../include/bb2diaspora.php:404
+#: ../../include/event.php:30 ../../include/bb2diaspora.php:407
 msgid "Finishes:"
 msgstr "结束:"
 
-#: ../../include/delivery.php:457 ../../include/notifier.php:767
+#: ../../include/delivery.php:457 ../../include/notifier.php:771
 msgid "(no subject)"
 msgstr "沒有题目"
 
@@ -8169,241 +8370,241 @@ msgstr "沒有题目"
 msgid " on Last.fm"
 msgstr ""
 
-#: ../../include/text.php:243
+#: ../../include/text.php:263
 msgid "prev"
 msgstr "上个"
 
-#: ../../include/text.php:245
+#: ../../include/text.php:265
 msgid "first"
 msgstr "首先"
 
-#: ../../include/text.php:274
+#: ../../include/text.php:294
 msgid "last"
 msgstr "最后"
 
-#: ../../include/text.php:277
+#: ../../include/text.php:297
 msgid "next"
 msgstr "下个"
 
-#: ../../include/text.php:295
+#: ../../include/text.php:315
 msgid "newer"
 msgstr ""
 
-#: ../../include/text.php:299
+#: ../../include/text.php:319
 msgid "older"
 msgstr ""
 
-#: ../../include/text.php:604
+#: ../../include/text.php:658
 msgid "No contacts"
 msgstr "没有熟人"
 
-#: ../../include/text.php:613
+#: ../../include/text.php:667
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
 msgstr[0] "%d熟人"
 
-#: ../../include/text.php:726
+#: ../../include/text.php:780
 msgid "poke"
 msgstr ""
 
-#: ../../include/text.php:726 ../../include/conversation.php:210
+#: ../../include/text.php:780 ../../include/conversation.php:210
 msgid "poked"
 msgstr ""
 
-#: ../../include/text.php:727
+#: ../../include/text.php:781
 msgid "ping"
 msgstr ""
 
-#: ../../include/text.php:727
+#: ../../include/text.php:781
 msgid "pinged"
 msgstr ""
 
-#: ../../include/text.php:728
+#: ../../include/text.php:782
 msgid "prod"
 msgstr ""
 
-#: ../../include/text.php:728
+#: ../../include/text.php:782
 msgid "prodded"
 msgstr ""
 
-#: ../../include/text.php:729
+#: ../../include/text.php:783
 msgid "slap"
 msgstr ""
 
-#: ../../include/text.php:729
+#: ../../include/text.php:783
 msgid "slapped"
 msgstr ""
 
-#: ../../include/text.php:730
+#: ../../include/text.php:784
 msgid "finger"
 msgstr ""
 
-#: ../../include/text.php:730
+#: ../../include/text.php:784
 msgid "fingered"
 msgstr ""
 
-#: ../../include/text.php:731
+#: ../../include/text.php:785
 msgid "rebuff"
 msgstr ""
 
-#: ../../include/text.php:731
+#: ../../include/text.php:785
 msgid "rebuffed"
 msgstr ""
 
-#: ../../include/text.php:743
+#: ../../include/text.php:797
 msgid "happy"
 msgstr ""
 
-#: ../../include/text.php:744
+#: ../../include/text.php:798
 msgid "sad"
 msgstr ""
 
-#: ../../include/text.php:745
+#: ../../include/text.php:799
 msgid "mellow"
 msgstr ""
 
-#: ../../include/text.php:746
+#: ../../include/text.php:800
 msgid "tired"
 msgstr ""
 
-#: ../../include/text.php:747
+#: ../../include/text.php:801
 msgid "perky"
 msgstr ""
 
-#: ../../include/text.php:748
+#: ../../include/text.php:802
 msgid "angry"
 msgstr ""
 
-#: ../../include/text.php:749
+#: ../../include/text.php:803
 msgid "stupified"
 msgstr ""
 
-#: ../../include/text.php:750
+#: ../../include/text.php:804
 msgid "puzzled"
 msgstr ""
 
-#: ../../include/text.php:751
+#: ../../include/text.php:805
 msgid "interested"
 msgstr ""
 
-#: ../../include/text.php:752
+#: ../../include/text.php:806
 msgid "bitter"
 msgstr ""
 
-#: ../../include/text.php:753
+#: ../../include/text.php:807
 msgid "cheerful"
 msgstr ""
 
-#: ../../include/text.php:754
+#: ../../include/text.php:808
 msgid "alive"
 msgstr ""
 
-#: ../../include/text.php:755
+#: ../../include/text.php:809
 msgid "annoyed"
 msgstr ""
 
-#: ../../include/text.php:756
+#: ../../include/text.php:810
 msgid "anxious"
 msgstr ""
 
-#: ../../include/text.php:757
+#: ../../include/text.php:811
 msgid "cranky"
 msgstr ""
 
-#: ../../include/text.php:758
+#: ../../include/text.php:812
 msgid "disturbed"
 msgstr ""
 
-#: ../../include/text.php:759
+#: ../../include/text.php:813
 msgid "frustrated"
 msgstr ""
 
-#: ../../include/text.php:760
+#: ../../include/text.php:814
 msgid "motivated"
 msgstr ""
 
-#: ../../include/text.php:761
+#: ../../include/text.php:815
 msgid "relaxed"
 msgstr ""
 
-#: ../../include/text.php:762
+#: ../../include/text.php:816
 msgid "surprised"
 msgstr ""
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "January"
 msgstr "一月"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "February"
 msgstr "二月"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "March"
 msgstr "三月"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "April"
 msgstr "四月"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "May"
 msgstr "五月"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "June"
 msgstr "六月"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "July"
 msgstr "七月"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "August"
 msgstr "八月"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "September"
 msgstr "九月"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "October"
 msgstr "十月"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "November"
 msgstr "十一月"
 
-#: ../../include/text.php:926
+#: ../../include/text.php:980
 msgid "December"
 msgstr "十二月"
 
-#: ../../include/text.php:1010
+#: ../../include/text.php:1067
 msgid "bytes"
 msgstr "字节"
 
-#: ../../include/text.php:1037 ../../include/text.php:1049
+#: ../../include/text.php:1094 ../../include/text.php:1106
 msgid "Click to open/close"
 msgstr ""
 
-#: ../../include/text.php:1222 ../../include/user.php:236
+#: ../../include/text.php:1279 ../../include/user.php:237
 msgid "default"
 msgstr "默认"
 
-#: ../../include/text.php:1234
+#: ../../include/text.php:1291
 msgid "Select an alternate language"
 msgstr "选择别的语言"
 
-#: ../../include/text.php:1444
+#: ../../include/text.php:1501
 msgid "activity"
 msgstr ""
 
-#: ../../include/text.php:1447
+#: ../../include/text.php:1504
 msgid "post"
 msgstr ""
 
-#: ../../include/text.php:1602
+#: ../../include/text.php:1659
 msgid "Item filed"
 msgstr ""
 
@@ -8411,19 +8612,19 @@ msgstr ""
 msgid "Sharing notification from Diaspora network"
 msgstr "分享通知从Diaspora网络"
 
-#: ../../include/diaspora.php:2236
+#: ../../include/diaspora.php:2239
 msgid "Attachments:"
 msgstr "附件:"
 
-#: ../../include/network.php:847
+#: ../../include/network.php:850
 msgid "view full size"
 msgstr "看全尺寸"
 
-#: ../../include/oembed.php:137
+#: ../../include/oembed.php:138
 msgid "Embedded content"
 msgstr "嵌入内容"
 
-#: ../../include/oembed.php:146
+#: ../../include/oembed.php:147
 msgid "Embedding disabled"
 msgstr "嵌入不能用"
 
@@ -8497,7 +8698,7 @@ msgstr "创造新组"
 msgid "Contacts not in any group"
 msgstr ""
 
-#: ../../include/nav.php:46 ../../boot.php:946
+#: ../../include/nav.php:46 ../../boot.php:983
 msgid "Logout"
 msgstr "注销"
 
@@ -8505,7 +8706,7 @@ msgstr "注销"
 msgid "End this session"
 msgstr "结束这段时间"
 
-#: ../../include/nav.php:49 ../../boot.php:1722
+#: ../../include/nav.php:49 ../../boot.php:1781
 msgid "Status"
 msgstr "现状"
 
@@ -8553,55 +8754,67 @@ msgstr "人物名录"
 msgid "Conversations from your friends"
 msgstr "从你朋友们的交谈"
 
-#: ../../include/nav.php:121
+#: ../../include/nav.php:114
+msgid "Network Reset"
+msgstr ""
+
+#: ../../include/nav.php:114
+msgid "Load Network page with no filters"
+msgstr ""
+
+#: ../../include/nav.php:122
 msgid "Friend Requests"
 msgstr "友谊邀请"
 
-#: ../../include/nav.php:123
+#: ../../include/nav.php:124
 msgid "See all notifications"
 msgstr "看所有的通知"
 
-#: ../../include/nav.php:124
+#: ../../include/nav.php:125
 msgid "Mark all system notifications seen"
 msgstr "记号各系统通知看过的"
 
-#: ../../include/nav.php:128
+#: ../../include/nav.php:129
 msgid "Private mail"
 msgstr "私人的邮件"
 
-#: ../../include/nav.php:129
+#: ../../include/nav.php:130
 msgid "Inbox"
 msgstr "收件箱"
 
-#: ../../include/nav.php:130
+#: ../../include/nav.php:131
 msgid "Outbox"
 msgstr "发件箱"
 
-#: ../../include/nav.php:134
+#: ../../include/nav.php:135
 msgid "Manage"
 msgstr "管理"
 
-#: ../../include/nav.php:134
+#: ../../include/nav.php:135
 msgid "Manage other pages"
 msgstr "管理别的页"
 
-#: ../../include/nav.php:138 ../../boot.php:1236
+#: ../../include/nav.php:138
+msgid "Delegations"
+msgstr ""
+
+#: ../../include/nav.php:142 ../../boot.php:1286
 msgid "Profiles"
 msgstr "简介"
 
-#: ../../include/nav.php:138 ../../boot.php:1236
-msgid "Manage/edit profiles"
-msgstr "管理/修改简介"
+#: ../../include/nav.php:142
+msgid "Manage/Edit Profiles"
+msgstr ""
 
-#: ../../include/nav.php:139
+#: ../../include/nav.php:144
 msgid "Manage/edit friends and contacts"
 msgstr "管理/编朋友们和熟人们"
 
-#: ../../include/nav.php:146
+#: ../../include/nav.php:151
 msgid "Site setup and configuration"
 msgstr "网站开办和配置"
 
-#: ../../include/nav.php:170
+#: ../../include/nav.php:175
 msgid "Nothing new here"
 msgstr "这里没有什么新的"
 
@@ -8643,37 +8856,37 @@ msgstr "比如:李某,打鱼"
 msgid "Random Profile"
 msgstr ""
 
-#: ../../include/contact_widgets.php:68
+#: ../../include/contact_widgets.php:70
 msgid "Networks"
 msgstr "网络"
 
-#: ../../include/contact_widgets.php:71
+#: ../../include/contact_widgets.php:73
 msgid "All Networks"
 msgstr "所有网络"
 
-#: ../../include/contact_widgets.php:98
+#: ../../include/contact_widgets.php:103 ../../include/features.php:59
 msgid "Saved Folders"
 msgstr ""
 
-#: ../../include/contact_widgets.php:101 ../../include/contact_widgets.php:129
+#: ../../include/contact_widgets.php:106 ../../include/contact_widgets.php:138
 msgid "Everything"
 msgstr ""
 
-#: ../../include/contact_widgets.php:126
+#: ../../include/contact_widgets.php:135
 msgid "Categories"
 msgstr ""
 
-#: ../../include/auth.php:36
+#: ../../include/auth.php:38
 msgid "Logged out."
 msgstr "注销了"
 
-#: ../../include/auth.php:126
+#: ../../include/auth.php:128
 msgid ""
 "We encountered a problem while logging in with the OpenID you provided. "
 "Please check the correct spelling of the ID."
 msgstr ""
 
-#: ../../include/auth.php:126
+#: ../../include/auth.php:128
 msgid "The error message was:"
 msgstr ""
 
@@ -8734,32 +8947,183 @@ msgstr "秒"
 msgid "%1$d %2$s ago"
 msgstr "%1$d %2$s以前"
 
-#: ../../include/datetime.php:472 ../../include/items.php:1695
+#: ../../include/datetime.php:472 ../../include/items.php:1705
 #, php-format
 msgid "%s's birthday"
 msgstr ""
 
-#: ../../include/datetime.php:473 ../../include/items.php:1696
+#: ../../include/datetime.php:473 ../../include/items.php:1706
 #, php-format
 msgid "Happy Birthday %s"
 msgstr ""
 
-#: ../../include/onepoll.php:414
-msgid "From: "
-msgstr "从:"
-
-#: ../../include/bbcode.php:202 ../../include/bbcode.php:423
+#: ../../include/bbcode.php:210 ../../include/bbcode.php:505
 msgid "Image/photo"
 msgstr "图像/照片"
 
-#: ../../include/bbcode.php:388 ../../include/bbcode.php:408
+#: ../../include/bbcode.php:262
+#, php-format
+msgid ""
+"<span><a href=\"%s\" target=\"external-link\">%s</a> wrote the following <a "
+"href=\"%s\" target=\"external-link\">post</a>:</span>"
+msgstr ""
+
+#: ../../include/bbcode.php:470 ../../include/bbcode.php:490
 msgid "$1 wrote:"
 msgstr "$1写:"
 
-#: ../../include/bbcode.php:427 ../../include/bbcode.php:428
+#: ../../include/bbcode.php:510 ../../include/bbcode.php:511
 msgid "Encrypted content"
 msgstr ""
 
+#: ../../include/features.php:23
+msgid "General Features"
+msgstr ""
+
+#: ../../include/features.php:25
+msgid "Multiple Profiles"
+msgstr ""
+
+#: ../../include/features.php:25
+msgid "Ability to create multiple profiles"
+msgstr ""
+
+#: ../../include/features.php:30
+msgid "Post Composition Features"
+msgstr ""
+
+#: ../../include/features.php:31
+msgid "Richtext Editor"
+msgstr ""
+
+#: ../../include/features.php:31
+msgid "Enable richtext editor"
+msgstr ""
+
+#: ../../include/features.php:32
+msgid "Post Preview"
+msgstr ""
+
+#: ../../include/features.php:32
+msgid "Allow previewing posts and comments before publishing them"
+msgstr ""
+
+#: ../../include/features.php:37
+msgid "Network Sidebar Widgets"
+msgstr ""
+
+#: ../../include/features.php:38
+msgid "Search by Date"
+msgstr ""
+
+#: ../../include/features.php:38
+msgid "Ability to select posts by date ranges"
+msgstr ""
+
+#: ../../include/features.php:39
+msgid "Group Filter"
+msgstr ""
+
+#: ../../include/features.php:39
+msgid "Enable widget to display Network posts only from selected group"
+msgstr ""
+
+#: ../../include/features.php:40
+msgid "Network Filter"
+msgstr ""
+
+#: ../../include/features.php:40
+msgid "Enable widget to display Network posts only from selected network"
+msgstr ""
+
+#: ../../include/features.php:41
+msgid "Save search terms for re-use"
+msgstr ""
+
+#: ../../include/features.php:46
+msgid "Network Tabs"
+msgstr ""
+
+#: ../../include/features.php:47
+msgid "Network Personal Tab"
+msgstr ""
+
+#: ../../include/features.php:47
+msgid "Enable tab to display only Network posts that you've interacted on"
+msgstr ""
+
+#: ../../include/features.php:48
+msgid "Network New Tab"
+msgstr ""
+
+#: ../../include/features.php:48
+msgid "Enable tab to display only new Network posts (from the last 12 hours)"
+msgstr ""
+
+#: ../../include/features.php:49
+msgid "Network Shared Links Tab"
+msgstr ""
+
+#: ../../include/features.php:49
+msgid "Enable tab to display only Network posts with links in them"
+msgstr ""
+
+#: ../../include/features.php:54
+msgid "Post/Comment Tools"
+msgstr ""
+
+#: ../../include/features.php:55
+msgid "Multiple Deletion"
+msgstr ""
+
+#: ../../include/features.php:55
+msgid "Select and delete multiple posts/comments at once"
+msgstr ""
+
+#: ../../include/features.php:56
+msgid "Edit Sent Posts"
+msgstr ""
+
+#: ../../include/features.php:56
+msgid "Edit and correct posts and comments after sending"
+msgstr ""
+
+#: ../../include/features.php:57
+msgid "Tagging"
+msgstr ""
+
+#: ../../include/features.php:57
+msgid "Ability to tag existing posts"
+msgstr ""
+
+#: ../../include/features.php:58
+msgid "Post Categories"
+msgstr ""
+
+#: ../../include/features.php:58
+msgid "Add categories to your posts"
+msgstr ""
+
+#: ../../include/features.php:59
+msgid "Ability to file posts under folders"
+msgstr ""
+
+#: ../../include/features.php:60
+msgid "Dislike Posts"
+msgstr ""
+
+#: ../../include/features.php:60
+msgid "Ability to dislike posts/comments"
+msgstr ""
+
+#: ../../include/features.php:61
+msgid "Star Posts"
+msgstr ""
+
+#: ../../include/features.php:61
+msgid "Ability to mark special posts with a star indicator"
+msgstr ""
+
 #: ../../include/dba.php:41
 #, php-format
 msgid "Cannot locate DNS info for database server '%s'"
@@ -8769,7 +9133,7 @@ msgstr "找不到DNS信息为数据库服务器「%s」"
 msgid "[no subject]"
 msgstr "[无题目]"
 
-#: ../../include/acl_selectors.php:286
+#: ../../include/acl_selectors.php:311
 msgid "Visible to everybody"
 msgstr "任何人可见的"
 
@@ -9014,83 +9378,83 @@ msgstr "不能取回熟人消息。"
 msgid "following"
 msgstr "关注"
 
-#: ../../include/items.php:3363
+#: ../../include/items.php:3380
 msgid "A new person is sharing with you at "
 msgstr "一位新人给你分享在"
 
-#: ../../include/items.php:3363
+#: ../../include/items.php:3380
 msgid "You have a new follower at "
 msgstr "你有新的关注者在"
 
-#: ../../include/items.php:4044
+#: ../../include/items.php:4064
 msgid "Archives"
 msgstr ""
 
-#: ../../include/user.php:38
+#: ../../include/user.php:39
 msgid "An invitation is required."
 msgstr "邀请必要的。"
 
-#: ../../include/user.php:43
+#: ../../include/user.php:44
 msgid "Invitation could not be verified."
 msgstr "不能证实邀请。"
 
-#: ../../include/user.php:51
+#: ../../include/user.php:52
 msgid "Invalid OpenID url"
 msgstr "无效的OpenID url"
 
-#: ../../include/user.php:66
+#: ../../include/user.php:67
 msgid "Please enter the required information."
 msgstr "请输入必要的信息。"
 
-#: ../../include/user.php:80
+#: ../../include/user.php:81
 msgid "Please use a shorter name."
 msgstr "请用短一点名。"
 
-#: ../../include/user.php:82
+#: ../../include/user.php:83
 msgid "Name too short."
 msgstr "名字太短。"
 
-#: ../../include/user.php:97
+#: ../../include/user.php:98
 msgid "That doesn't appear to be your full (First Last) name."
 msgstr "这看上去不是您的全姓名。"
 
-#: ../../include/user.php:102
+#: ../../include/user.php:103
 msgid "Your email domain is not among those allowed on this site."
 msgstr "这网站允许的域名中没有您的"
 
-#: ../../include/user.php:105
+#: ../../include/user.php:106
 msgid "Not a valid email address."
 msgstr "无效的邮件地址。"
 
-#: ../../include/user.php:115
+#: ../../include/user.php:116
 msgid "Cannot use that email."
 msgstr "不能用这个邮件地址。"
 
-#: ../../include/user.php:121
+#: ../../include/user.php:122
 msgid ""
 "Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
 "must also begin with a letter."
 msgstr "您的昵称只能包括\"a-z\",\"0-9\",\"-\"和\"_\",还有头一字必须是拉丁字。"
 
-#: ../../include/user.php:127 ../../include/user.php:225
+#: ../../include/user.php:128 ../../include/user.php:226
 msgid "Nickname is already registered. Please choose another."
 msgstr "昵称已经报到。请选择新的。"
 
-#: ../../include/user.php:137
+#: ../../include/user.php:138
 msgid ""
 "Nickname was once registered here and may not be re-used. Please choose "
 "another."
 msgstr ""
 
-#: ../../include/user.php:153
+#: ../../include/user.php:154
 msgid "SERIOUS ERROR: Generation of security keys failed."
 msgstr "要紧错误:产生安全钥匙失败了。"
 
-#: ../../include/user.php:211
+#: ../../include/user.php:212
 msgid "An error occurred during registration. Please try again."
 msgstr "报到出了问题。请再试。"
 
-#: ../../include/user.php:246
+#: ../../include/user.php:247
 msgid "An error occurred creating your default profile. Please try again."
 msgstr "造成默认简介出了问题。请再试。"
 
@@ -9116,34 +9480,34 @@ msgstr ""
 msgid "stopped following"
 msgstr "结束关注了"
 
-#: ../../include/Contact.php:225 ../../include/conversation.php:795
+#: ../../include/Contact.php:225 ../../include/conversation.php:816
 msgid "Poke"
 msgstr ""
 
-#: ../../include/Contact.php:226 ../../include/conversation.php:789
+#: ../../include/Contact.php:226 ../../include/conversation.php:810
 msgid "View Status"
 msgstr ""
 
-#: ../../include/Contact.php:227 ../../include/conversation.php:790
+#: ../../include/Contact.php:227 ../../include/conversation.php:811
 msgid "View Profile"
 msgstr ""
 
-#: ../../include/Contact.php:228 ../../include/conversation.php:791
+#: ../../include/Contact.php:228 ../../include/conversation.php:812
 msgid "View Photos"
 msgstr ""
 
 #: ../../include/Contact.php:229 ../../include/Contact.php:242
-#: ../../include/conversation.php:792
+#: ../../include/conversation.php:813
 msgid "Network Posts"
 msgstr ""
 
 #: ../../include/Contact.php:230 ../../include/Contact.php:242
-#: ../../include/conversation.php:793
+#: ../../include/conversation.php:814
 msgid "Edit Contact"
 msgstr ""
 
 #: ../../include/Contact.php:231 ../../include/Contact.php:242
-#: ../../include/conversation.php:794
+#: ../../include/conversation.php:815
 msgid "Send PM"
 msgstr "法私人的新闻"
 
@@ -9161,90 +9525,92 @@ msgstr ""
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr ""
 
-#: ../../include/conversation.php:599 ../../object/Item.php:220
+#: ../../include/conversation.php:620 ../../object/Item.php:248
 msgid "Categories:"
 msgstr ""
 
-#: ../../include/conversation.php:600 ../../object/Item.php:221
+#: ../../include/conversation.php:621 ../../object/Item.php:249
 msgid "Filed under:"
 msgstr ""
 
-#: ../../include/conversation.php:685
+#: ../../include/conversation.php:706
 msgid "remove"
 msgstr ""
 
-#: ../../include/conversation.php:689
+#: ../../include/conversation.php:710
 msgid "Delete Selected Items"
 msgstr "删除选的项目"
 
-#: ../../include/conversation.php:788
+#: ../../include/conversation.php:809
 msgid "Follow Thread"
 msgstr ""
 
-#: ../../include/conversation.php:857
+#: ../../include/conversation.php:878
 #, php-format
 msgid "%s likes this."
 msgstr "%s喜欢这个."
 
-#: ../../include/conversation.php:857
+#: ../../include/conversation.php:878
 #, php-format
 msgid "%s doesn't like this."
 msgstr "%s没有喜欢这个."
 
-#: ../../include/conversation.php:861
-#, php-format
-msgid "<span  %1$s>%2$d people</span> like this."
-msgstr "<span  %1$s>%2$d人</span>喜欢这个。"
+#: ../../include/conversation.php:884
+msgid "like this"
+msgstr ""
 
-#: ../../include/conversation.php:863
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't like this."
-msgstr "<span  %1$s>%2$d人</span>不喜欢这个。"
+#: ../../include/conversation.php:888
+msgid "don't like this"
+msgstr ""
+
+#: ../../include/conversation.php:895
+msgid "people"
+msgstr ""
 
-#: ../../include/conversation.php:869
+#: ../../include/conversation.php:905
 msgid "and"
 msgstr "和"
 
-#: ../../include/conversation.php:875
+#: ../../include/conversation.php:911
 #, php-format
 msgid ", and %d other people"
 msgstr ",和%d别人"
 
-#: ../../include/conversation.php:877
+#: ../../include/conversation.php:913
 #, php-format
 msgid "%s like this."
 msgstr "%s喜欢这个"
 
-#: ../../include/conversation.php:877
+#: ../../include/conversation.php:913
 #, php-format
 msgid "%s don't like this."
 msgstr "%s不喜欢这个"
 
-#: ../../include/conversation.php:901 ../../include/conversation.php:919
+#: ../../include/conversation.php:940 ../../include/conversation.php:958
 msgid "Visible to <strong>everybody</strong>"
 msgstr "<strong>大家</strong>可见的"
 
-#: ../../include/conversation.php:903 ../../include/conversation.php:921
+#: ../../include/conversation.php:942 ../../include/conversation.php:960
 msgid "Please enter a video link/URL:"
 msgstr "请输入视频连接/URL:"
 
-#: ../../include/conversation.php:904 ../../include/conversation.php:922
+#: ../../include/conversation.php:943 ../../include/conversation.php:961
 msgid "Please enter an audio link/URL:"
 msgstr "请输入音响连接/URL:"
 
-#: ../../include/conversation.php:905 ../../include/conversation.php:923
+#: ../../include/conversation.php:944 ../../include/conversation.php:962
 msgid "Tag term:"
 msgstr "标签:"
 
-#: ../../include/conversation.php:907 ../../include/conversation.php:925
+#: ../../include/conversation.php:946 ../../include/conversation.php:964
 msgid "Where are you right now?"
 msgstr "你在哪里?"
 
-#: ../../include/conversation.php:908
+#: ../../include/conversation.php:947
 msgid "Delete item(s)?"
 msgstr ""
 
-#: ../../include/conversation.php:987
+#: ../../include/conversation.php:1026
 msgid "permissions"
 msgstr "权利"
 
@@ -9260,113 +9626,133 @@ msgstr ""
 msgid "This action is not available under your subscription plan."
 msgstr ""
 
-#: ../../boot.php:605
+#: ../../boot.php:634
 msgid "Delete this item?"
 msgstr "删除这个项目?"
 
-#: ../../boot.php:608
+#: ../../boot.php:637
 msgid "show fewer"
 msgstr "显示更小"
 
-#: ../../boot.php:817
+#: ../../boot.php:851
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:819
+#: ../../boot.php:856
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: ../../boot.php:920
+#: ../../boot.php:958
 msgid "Create a New Account"
 msgstr "创造新的账户"
 
-#: ../../boot.php:949
+#: ../../boot.php:986
 msgid "Nickname or Email address: "
 msgstr "绰号或电子邮件地址: "
 
-#: ../../boot.php:950
+#: ../../boot.php:987
 msgid "Password: "
 msgstr "密码: "
 
-#: ../../boot.php:951
+#: ../../boot.php:988
 msgid "Remember me"
 msgstr ""
 
-#: ../../boot.php:954
+#: ../../boot.php:991
 msgid "Or login using OpenID: "
-msgstr ""
+msgstr "或者用OpenID登记:"
 
-#: ../../boot.php:960
+#: ../../boot.php:997
 msgid "Forgot your password?"
 msgstr "忘记你的密码吗?"
 
-#: ../../boot.php:1085
+#: ../../boot.php:1000
+msgid "Website Terms of Service"
+msgstr ""
+
+#: ../../boot.php:1001
+msgid "terms of service"
+msgstr ""
+
+#: ../../boot.php:1003
+msgid "Website Privacy Policy"
+msgstr ""
+
+#: ../../boot.php:1004
+msgid "privacy policy"
+msgstr ""
+
+#: ../../boot.php:1133
 msgid "Requested account is not available."
 msgstr ""
 
-#: ../../boot.php:1162
+#: ../../boot.php:1212
 msgid "Edit profile"
 msgstr "修改简介"
 
-#: ../../boot.php:1228
+#: ../../boot.php:1278
 msgid "Message"
 msgstr ""
 
-#: ../../boot.php:1350 ../../boot.php:1436
+#: ../../boot.php:1286
+msgid "Manage/edit profiles"
+msgstr "管理/修改简介"
+
+#: ../../boot.php:1409 ../../boot.php:1495
 msgid "g A l F d"
 msgstr "g A l d F"
 
-#: ../../boot.php:1351 ../../boot.php:1437
+#: ../../boot.php:1410 ../../boot.php:1496
 msgid "F d"
 msgstr "F d"
 
-#: ../../boot.php:1396 ../../boot.php:1477
+#: ../../boot.php:1455 ../../boot.php:1536
 msgid "[today]"
 msgstr "[今天]"
 
-#: ../../boot.php:1408
+#: ../../boot.php:1467
 msgid "Birthday Reminders"
 msgstr "提醒生日"
 
-#: ../../boot.php:1409
+#: ../../boot.php:1468
 msgid "Birthdays this week:"
 msgstr "这周的生日:"
 
-#: ../../boot.php:1470
+#: ../../boot.php:1529
 msgid "[No description]"
 msgstr "[无描述]"
 
-#: ../../boot.php:1488
+#: ../../boot.php:1547
 msgid "Event Reminders"
 msgstr "事件提醒"
 
-#: ../../boot.php:1489
+#: ../../boot.php:1548
 msgid "Events this week:"
 msgstr "这周的事件:"
 
-#: ../../boot.php:1725
+#: ../../boot.php:1784
 msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../boot.php:1732
+#: ../../boot.php:1791
 msgid "Profile Details"
 msgstr ""
 
-#: ../../boot.php:1749
+#: ../../boot.php:1808
 msgid "Events and Calendar"
 msgstr ""
 
-#: ../../boot.php:1756
+#: ../../boot.php:1815
 msgid "Only You Can See This"
 msgstr ""
 
-#: ../../object/Item.php:232
+#: ../../object/Item.php:260
 msgid "via"
 msgstr ""
 
-#: ../../index.php:398
+#: ../../index.php:392
 msgid "toggle mobile"
 msgstr ""
 
@@ -9425,3 +9811,11 @@ msgstr "用OEmbed为YouTube视频"
 #: ../../addon.old/oembed.old/oembed.php:71
 msgid "URL to embed:"
 msgstr "URL要嵌入:"
+
+#: ../../addon.old/tumblr/tumblr.php:74
+msgid "Tumblr login"
+msgstr "Tumblr登记名"
+
+#: ../../addon.old/tumblr/tumblr.php:79
+msgid "Tumblr password"
+msgstr "Tumblr密码"
index 4e0cc5a00f676014eb74a1f78df41ade9f5e2e87..4481cb6b10b76850b7514dbd70699624e339960c 100644 (file)
@@ -13,7 +13,7 @@ $a->strings["Contact not found."] = "没找到熟人。";
 $a->strings["Repair Contact Settings"] = "维修熟人设置";
 $a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working."] = "<strong>注意:这是很高等的</strong>,你输入错的信息你和熟人的沟通会弄失灵了。";
 $a->strings["Please use your browser 'Back' button <strong>now</strong> if you are uncertain what to do on this page."] = "请<strong>立即</strong>用后退按钮如果您不确定怎么用这页";
-$a->strings["Return to contact editor"] = "";
+$a->strings["Return to contact editor"] = "回归熟人处理器";
 $a->strings["Name"] = "名字";
 $a->strings["Account Nickname"] = "帐户昵称";
 $a->strings["@Tagname - overrides Name/Nickname"] = "@Tagname越过名/昵称";
@@ -84,7 +84,6 @@ $a->strings["Public access denied."] = "公众看拒绝";
 $a->strings["No photos selected"] = "没有照片挑选了";
 $a->strings["Access to this item is restricted."] = "这个项目使用权限的。";
 $a->strings["You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."] = "";
-$a->strings["You have used %1$.2f Mbytes of photo storage."] = "";
 $a->strings["Upload Photos"] = "上传照片";
 $a->strings["New album name: "] = "新册名:";
 $a->strings["or existing album name: "] = "或现有册名";
@@ -257,6 +256,11 @@ $a->strings["This is most often a permission setting, as the web server may not
 $a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Friendica top folder."] = "";
 $a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "";
 $a->strings[".htconfig.php is writable"] = ".htconfig.php是可写的";
+$a->strings["Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "";
+$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder."] = "";
+$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "";
+$a->strings["Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files (.tpl) that it contains."] = "";
+$a->strings["view/smarty3 is writable"] = "";
 $a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "";
 $a->strings["Url rewrite is working"] = "";
 $a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "数据库设置文件「.htconfig.php」不能被写。请把包括的正文造成设置文件在网服务器子目录。";
@@ -333,8 +337,8 @@ $a->strings["Notification type: "] = "通知种类:";
 $a->strings["Friend Suggestion"] = "朋友建议";
 $a->strings["suggested by %s"] = "由%s建议的";
 $a->strings["Hide this contact from others"] = "隐藏这个熟人给别人";
-$a->strings["Post a new friend activity"] = "";
-$a->strings["if applicable"] = "";
+$a->strings["Post a new friend activity"] = "表新朋友活动";
+$a->strings["if applicable"] = "或适用";
 $a->strings["Approve"] = "批准";
 $a->strings["Claims to be known to you: "] = "声称被您认识:";
 $a->strings["yes"] = "是";
@@ -385,7 +389,7 @@ $a->strings["%d contact in common"] = array(
 $a->strings["View all contacts"] = "看所有的熟人";
 $a->strings["Unblock"] = "不拦";
 $a->strings["Block"] = "拦";
-$a->strings["Toggle Blocked status"] = "";
+$a->strings["Toggle Blocked status"] = "交替拦配置";
 $a->strings["Unignore"] = "停不理";
 $a->strings["Toggle Ignored status"] = "";
 $a->strings["Unarchive"] = "";
@@ -437,7 +441,6 @@ $a->strings["Find"] = "搜索";
 $a->strings["No valid account found."] = "找不到效的账户。";
 $a->strings["Password reset request issued. Check your email."] = "重设密码要求发布了。核对您的收件箱。";
 $a->strings["Password reset requested at %s"] = "重设密码要求被发布%s";
-$a->strings["Administrator"] = "管理员";
 $a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "要求确认不了。(您可能已经提交它。)重设密码失败了。";
 $a->strings["Password Reset"] = "复位密码";
 $a->strings["Your password has been reset as requested."] = "您的密码被重设如要求的。";
@@ -445,14 +448,17 @@ $a->strings["Your new password is"] = "你的新的密码是";
 $a->strings["Save or copy your new password - and then"] = "保存或复制新密码-之后";
 $a->strings["click here to login"] = "在这儿点击";
 $a->strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "您的密码能被变化从<em>设置</em>页成功登记后。";
+$a->strings["Your password has been changed at %s"] = "";
 $a->strings["Forgot your Password?"] = "忘记你的密码吗?";
 $a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "输入您的邮件地址和提交为重置密码。然后核对收件箱看别的说明。";
 $a->strings["Nickname or Email: "] = "昵称或邮件地址:";
 $a->strings["Reset"] = "复位";
+$a->strings["Additional features"] = "";
 $a->strings["Missing some important data!"] = "有的重要信息失踪的!";
 $a->strings["Update"] = "更新";
 $a->strings["Failed to connect with email account using the settings provided."] = "不能连接电子邮件账户用输入的设置。";
 $a->strings["Email settings updated."] = "电子邮件设置更新了";
+$a->strings["Features updated"] = "";
 $a->strings["Passwords do not match. Password unchanged."] = "密码们不相配。密码没未改变的。";
 $a->strings["Empty passwords are not allowed. Password unchanged."] = "空的密码禁止。密码没未改变的。";
 $a->strings["Password changed."] = "密码变化了。";
@@ -476,6 +482,9 @@ $a->strings["No name"] = "无名";
 $a->strings["Remove authorization"] = "撤消权能";
 $a->strings["No Plugin settings configured"] = "没插件设置配置了";
 $a->strings["Plugin Settings"] = "插件设置";
+$a->strings["Off"] = "";
+$a->strings["On"] = "";
+$a->strings["Additional Features"] = "";
 $a->strings["Built-in support for %s connectivity is %s"] = "包括的支持为%s连通性是%s";
 $a->strings["enabled"] = "能够做的";
 $a->strings["disabled"] = "使不能用";
@@ -529,7 +538,7 @@ $a->strings["Permit unknown people to send you private mail?"] = "";
 $a->strings["Profile is <strong>not published</strong>."] = "简介是<strong>没出版</strong>";
 $a->strings["or"] = "或者";
 $a->strings["Your Identity Address is"] = "您的同一个人地址是";
-$a->strings["Automatically expire posts after this many days:"] = "";
+$a->strings["Automatically expire posts after this many days:"] = "自动地过期文章这数天:";
 $a->strings["If empty, posts will not expire. Expired posts will be deleted"] = "如果空的,文章不会过期。过期的文章被删除";
 $a->strings["Advanced expiration settings"] = "先进的过期设置";
 $a->strings["Advanced Expiration"] = "先进的过期";
@@ -572,7 +581,7 @@ $a->strings["You are poked/prodded/etc. in a post"] = "";
 $a->strings["Advanced Account/Page Type Settings"] = "";
 $a->strings["Change the behaviour of this account for special situations"] = "";
 $a->strings["Manage Identities and/or Pages"] = "管理身份或页";
-$a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "";
+$a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "交替不同同一人或社会/组页合用您的账户或给您「管理」批准";
 $a->strings["Select an identity to manage: "] = "选择同一个人管理:";
 $a->strings["Search Results For:"] = "搜索结果为:";
 $a->strings["Remove term"] = "删除关键字";
@@ -585,10 +594,10 @@ $a->strings["Sort by Post Date"] = "";
 $a->strings["Posts that mention or involve you"] = "";
 $a->strings["New"] = "新";
 $a->strings["Activity Stream - by date"] = "";
-$a->strings["Starred"] = "被星";
-$a->strings["Favourite Posts"] = "";
 $a->strings["Shared Links"] = "";
 $a->strings["Interesting Links"] = "";
+$a->strings["Starred"] = "被星";
+$a->strings["Favourite Posts"] = "";
 $a->strings["Warning: This group contains %s member from an insecure network."] = array(
        0 => "警告:这个组包括%s成员从不安全网络。",
 );
@@ -601,7 +610,9 @@ $a->strings["Save"] = "保存";
 $a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "这个网站超过一天最多账户注册。请明天再试。";
 $a->strings["Import"] = "";
 $a->strings["Move account"] = "";
-$a->strings["You can import an account from another Friendica server. <br>\r\n                            You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here.<br>\r\n                            <b>This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from diaspora"] = "";
+$a->strings["You can import an account from another Friendica server."] = "";
+$a->strings["You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here."] = "";
+$a->strings["This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from Diaspora"] = "";
 $a->strings["Account file"] = "";
 $a->strings["To export your accont, go to \"Settings->Export your porsonal data\" and select \"Export account\""] = "";
 $a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "";
@@ -784,6 +795,7 @@ $a->strings["Self-signed certificate, use SSL for local links only (discouraged)
 $a->strings["File upload"] = "文件上传";
 $a->strings["Policies"] = "政策";
 $a->strings["Advanced"] = "高等";
+$a->strings["Performance"] = "";
 $a->strings["Site name"] = "网页名字";
 $a->strings["Banner/Logo"] = "标题/标志";
 $a->strings["System language"] = "系统语言";
@@ -793,6 +805,8 @@ $a->strings["Mobile system theme"] = "";
 $a->strings["Theme for mobile devices"] = "";
 $a->strings["SSL link policy"] = "";
 $a->strings["Determines whether generated links should be forced to use SSL"] = "";
+$a->strings["'Share' element"] = "";
+$a->strings["Activates the bbcode element 'share' for repeating items."] = "";
 $a->strings["Maximum image size"] = "图片最大尺寸";
 $a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "";
 $a->strings["Maximum image length"] = "";
@@ -800,6 +814,8 @@ $a->strings["Maximum length in pixels of the longest side of uploaded images. De
 $a->strings["JPEG image quality"] = "";
 $a->strings["Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality."] = "";
 $a->strings["Register policy"] = "注册政策";
+$a->strings["Maximum Daily Registrations"] = "";
+$a->strings["If registration is permitted above, this sets the maximum number of new user registrations to accept per day.  If register is set to closed, this setting has no effect."] = "";
 $a->strings["Register text"] = "注册正文";
 $a->strings["Will be displayed prominently on the registration page."] = "";
 $a->strings["Accounts abandoned after x days"] = "账户丢弃X天后";
@@ -846,6 +862,14 @@ $a->strings["Poll interval"] = "";
 $a->strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "";
 $a->strings["Maximum Load Average"] = "";
 $a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "";
+$a->strings["Use MySQL full text engine"] = "";
+$a->strings["Activates the full text engine. Speeds up search - but can only search for four and more characters."] = "";
+$a->strings["Path to item cache"] = "";
+$a->strings["Cache duration in seconds"] = "";
+$a->strings["How long should the cache files be hold? Default value is 86400 seconds (One day)."] = "";
+$a->strings["Path for lock file"] = "";
+$a->strings["Temp path"] = "";
+$a->strings["Base path to installation"] = "";
 $a->strings["Update has been marked successful"] = "";
 $a->strings["Executing %s failed. Check system logs."] = "";
 $a->strings["Update %s was successfully applied."] = "";
@@ -927,6 +951,10 @@ $a->strings["Applications"] = "应用";
 $a->strings["No installed applications."] = "没有安装的应用";
 $a->strings["Search"] = "搜索";
 $a->strings["Profile not found."] = "找不到简介。";
+$a->strings["Profile deleted."] = "简介删除了。";
+$a->strings["Profile-"] = "简介-";
+$a->strings["New profile created."] = "创造新的简介";
+$a->strings["Profile unavailable to clone."] = "简介不可用为复制。";
 $a->strings["Profile Name is required."] = "必要简介名";
 $a->strings["Marital Status"] = "";
 $a->strings["Romantic Partner"] = "";
@@ -947,12 +975,9 @@ $a->strings["public profile"] = "";
 $a->strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "";
 $a->strings[" - Visit %1\$s's %2\$s"] = "";
 $a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "";
-$a->strings["Profile deleted."] = "简介删除了。";
-$a->strings["Profile-"] = "简介-";
-$a->strings["New profile created."] = "创造新的简介";
-$a->strings["Profile unavailable to clone."] = "简介不可用为复制。";
 $a->strings["Hide your contact/friend list from viewers of this profile?"] = "藏起来发现您的熟人/朋友单不让这个简介看着看?";
 $a->strings["Edit Profile Details"] = "剪辑简介消息";
+$a->strings["Change Profile Photo"] = "";
 $a->strings["View this profile"] = "看这个简介";
 $a->strings["Create a new profile using these settings"] = "造成新的简介用这些设置";
 $a->strings["Clone this profile"] = "复制这个简介";
@@ -1004,12 +1029,12 @@ $a->strings["Edit visibility"] = "修改能见度";
 $a->strings["Save to Folder:"] = "";
 $a->strings["- select -"] = "";
 $a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s把%4\$s标签%2\$s的%3\$s";
-$a->strings["No potential page delegates located."] = "";
-$a->strings["Delegate Page Management"] = "";
-$a->strings["Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely."] = "";
-$a->strings["Existing Page Managers"] = "";
-$a->strings["Existing Page Delegates"] = "";
-$a->strings["Potential Delegates"] = "";
+$a->strings["No potential page delegates located."] = "找不到可能代表页人。";
+$a->strings["Delegate Page Management"] = "页代表管理";
+$a->strings["Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely."] = "代表会管理所有的方面这个账户/页除了基础账户配置以外。请别代表您私人账户给您没完全信的人。";
+$a->strings["Existing Page Managers"] = "目前页管理员";
+$a->strings["Existing Page Delegates"] = "目前页代表";
+$a->strings["Potential Delegates"] = "潜力的代表";
 $a->strings["Add"] = "加";
 $a->strings["No entries."] = "没有项目。";
 $a->strings["Source (bbcode) text:"] = "";
@@ -1094,6 +1119,7 @@ $a->strings["Do not import your Facebook profile wall conversations"] = "别进
 $a->strings["If you choose to link conversations and leave both of these boxes unchecked, your Facebook profile wall will be merged with your profile wall on this website and your privacy settings on this website will be used to determine who may see the conversations."] = "如果您选择连接交流和留这两个复选框空则,您Facebook简介墙被在您这网站的简介墙融合和您的这网站隐私设置决定谁能看那些交流。";
 $a->strings["Comma separated applications to ignore"] = "逗号分开的应用要不理";
 $a->strings["Problems with Facebook Real-Time Updates"] = "";
+$a->strings["Administrator"] = "管理员";
 $a->strings["Facebook Connector Settings"] = "Facebook连接器设置";
 $a->strings["Facebook API Key"] = "";
 $a->strings["Error: it appears that you have specified the App-ID and -Secret in your .htconfig.php file. As long as they are specified there, they cannot be set using this form.<br><br>"] = "";
@@ -1129,7 +1155,11 @@ $a->strings["Facebook Post disabled"] = "";
 $a->strings["Facebook Post"] = "";
 $a->strings["Install Facebook Post connector for this account."] = "";
 $a->strings["Remove Facebook Post connector"] = "";
+$a->strings["Suppress \"View on friendica\""] = "";
+$a->strings["Mirror wall posts from facebook to friendica."] = "";
+$a->strings["Post to page/group:"] = "";
 $a->strings["Facebook Post Settings"] = "";
+$a->strings["%s:"] = "";
 $a->strings["%d person likes this"] = array(
        0 => "%d人喜欢这个",
 );
@@ -1177,12 +1207,12 @@ $a->strings["doubt"] = "";
 $a->strings["doubted"] = "";
 $a->strings["glare"] = "";
 $a->strings["glared at"] = "";
-$a->strings["YourLS Settings"] = "";
-$a->strings["URL: http://"] = "";
-$a->strings["Username:"] = "";
-$a->strings["Password:"] = "";
-$a->strings["Use SSL "] = "";
-$a->strings["yourls Settings saved."] = "";
+$a->strings["YourLS Settings"] = "YourLS配置";
+$a->strings["URL: http://"] = "URL: http://";
+$a->strings["Username:"] = "用户名:";
+$a->strings["Password:"] = "密码:";
+$a->strings["Use SSL "] = "用SSL";
+$a->strings["yourls Settings saved."] = "yourls配置保存了。";
 $a->strings["Post to LiveJournal"] = "";
 $a->strings["LiveJournal Post Settings"] = "";
 $a->strings["Enable LiveJournal Post Plugin"] = "";
@@ -1193,7 +1223,7 @@ $a->strings["Not Safe For Work (General Purpose Content Filter) settings"] = "";
 $a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW.  This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "";
 $a->strings["Enable Content filter"] = "";
 $a->strings["Comma separated list of keywords to hide"] = "";
-$a->strings["Use /expression/ to provide regular expressions"] = "";
+$a->strings["Use /expression/ to provide regular expressions"] = "用/<i>表达式</i>/为输入正则表达式";
 $a->strings["NSFW Settings saved."] = "NSFW设置保持了。";
 $a->strings["%s - Click to open/close"] = "%s - 点击为打开/关闭";
 $a->strings["Forums"] = "";
@@ -1205,6 +1235,7 @@ $a->strings["Randomise Page/Forum list"] = "";
 $a->strings["Show pages/forums on profile page"] = "";
 $a->strings["Planets Settings"] = "";
 $a->strings["Enable Planets Plugin"] = "";
+$a->strings["Forum Directory"] = "";
 $a->strings["Login"] = "登录";
 $a->strings["OpenID"] = "OpenID";
 $a->strings["Latest users"] = "";
@@ -1410,10 +1441,10 @@ $a->strings["Report Bug"] = "报案程序错误";
 $a->strings["No Timeline settings updated."] = "";
 $a->strings["No Timeline Settings"] = "";
 $a->strings["Disable Archive selector on profile wall"] = "";
-$a->strings["\"Blockem\" Settings"] = "";
-$a->strings["Comma separated profile URLS to block"] = "";
-$a->strings["BLOCKEM Settings saved."] = "";
-$a->strings["Blocked %s - Click to open/close"] = "";
+$a->strings["\"Blockem\" Settings"] = "「Blockem」配置";
+$a->strings["Comma separated profile URLS to block"] = "逗号分简介URL为栏";
+$a->strings["BLOCKEM Settings saved."] = "「Blockem」配置保存了。";
+$a->strings["Blocked %s - Click to open/close"] = "%s拦了-点击为开关";
 $a->strings["Unblock Author"] = "";
 $a->strings["Block Author"] = "";
 $a->strings["blockem settings updated"] = "";
@@ -1428,7 +1459,7 @@ $a->strings["Tile Server URL"] = "";
 $a->strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "";
 $a->strings["Default zoom"] = "";
 $a->strings["The default zoom level. (1:world, 18:highest)"] = "";
-$a->strings["Editplain settings updated."] = "";
+$a->strings["Group Text settings updated."] = "";
 $a->strings["Group Text"] = "";
 $a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "";
 $a->strings["Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"] = "";
@@ -1453,10 +1484,13 @@ $a->strings["Post to Libertree by default"] = "";
 $a->strings["Altpager settings updated."] = "";
 $a->strings["Alternate Pagination Setting"] = "";
 $a->strings["Use links to \"newer\" and \"older\" pages in place of page numbers?"] = "";
+$a->strings["Force global use of the alternate pager"] = "";
+$a->strings["Each user chooses whether to use the alternate pager"] = "";
 $a->strings["The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail."] = "";
 $a->strings["Use the MathJax renderer"] = "";
 $a->strings["MathJax Base URL"] = "";
 $a->strings["The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax."] = "";
+$a->strings["Editplain settings updated."] = "";
 $a->strings["Editplain Settings"] = "";
 $a->strings["Disable richtext status editor"] = "";
 $a->strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "";
@@ -1467,7 +1501,7 @@ $a->strings["Gravatar settings updated."] = "";
 $a->strings["Your Friendica test account is about to expire."] = "";
 $a->strings["Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at http://dir.friendica.com/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."] = "";
 $a->strings["\"pageheader\" Settings"] = "\"pageheader";
-$a->strings["pageheader Settings saved."] = "";
+$a->strings["pageheader Settings saved."] = "pageHeader配置保存了。";
 $a->strings["Post to Insanejournal"] = "";
 $a->strings["InsaneJournal Post Settings"] = "";
 $a->strings["Enable InsaneJournal Post Plugin"] = "";
@@ -1511,16 +1545,21 @@ $a->strings["If enabled all your <strong>public</strong> postings can be posted
 $a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "";
 $a->strings["Allow posting to StatusNet"] = "许放在StatusNet";
 $a->strings["Send public postings to StatusNet by default"] = "默认发送公开文章在StatusNet";
+$a->strings["Mirror all posts from statusnet that are no replies or repeated messages"] = "";
+$a->strings["Shortening method that optimizes the post"] = "";
 $a->strings["Send linked #-tags and @-names to StatusNet"] = "";
 $a->strings["Clear OAuth configuration"] = "清理出OAuth设置";
 $a->strings["API URL"] = "API URL";
 $a->strings["Infinite Improbability Drive"] = "";
+$a->strings["You are now authenticated to tumblr."] = "";
+$a->strings["return to the connector page"] = "";
 $a->strings["Post to Tumblr"] = "发送到Tumblr";
 $a->strings["Tumblr Post Settings"] = "Tumblr发送设置";
+$a->strings["(Re-)Authenticate your tumblr page"] = "";
 $a->strings["Enable Tumblr Post Plugin"] = "使Tumblr发送插件能够";
-$a->strings["Tumblr login"] = "Tumblr登记名";
-$a->strings["Tumblr password"] = "Tumblr密码";
 $a->strings["Post to Tumblr by default"] = "默认地给Tumblr发送";
+$a->strings["Post to page:"] = "";
+$a->strings["You are not authenticated to tumblr"] = "";
 $a->strings["Numfriends settings updated."] = "";
 $a->strings["Numfriends Settings"] = "";
 $a->strings["How many contacts to display on profile sidebar"] = "";
@@ -1561,6 +1600,8 @@ $a->strings["If enabled all your <strong>public</strong> postings can be posted
 $a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "";
 $a->strings["Allow posting to Twitter"] = "允许发送到Twitter";
 $a->strings["Send public postings to Twitter by default"] = "默认地发送公开文章到Twitter";
+$a->strings["Mirror all posts from twitter that are no replies or retweets"] = "";
+$a->strings["Shortening method that optimizes the tweet"] = "";
 $a->strings["Send linked #-tags and @-names to Twitter"] = "";
 $a->strings["Consumer key"] = "钥匙(Consumer key)";
 $a->strings["Consumer secret"] = "密码(Consumer secret)";
@@ -1663,6 +1704,7 @@ $a->strings["Zot!"] = "Zot!";
 $a->strings["LinkedIn"] = "LinkedIn";
 $a->strings["XMPP/IM"] = "XMPP/IM";
 $a->strings["MySpace"] = "MySpace";
+$a->strings["Google+"] = "";
 $a->strings["Male"] = "男的";
 $a->strings["Female"] = "女的";
 $a->strings["Currently Male"] = "现在男的";
@@ -1823,6 +1865,8 @@ $a->strings["Conversations on this site"] = "这个网站的交谈";
 $a->strings["Directory"] = "名录";
 $a->strings["People directory"] = "人物名录";
 $a->strings["Conversations from your friends"] = "从你朋友们的交谈";
+$a->strings["Network Reset"] = "";
+$a->strings["Load Network page with no filters"] = "";
 $a->strings["Friend Requests"] = "友谊邀请";
 $a->strings["See all notifications"] = "看所有的通知";
 $a->strings["Mark all system notifications seen"] = "记号各系统通知看过的";
@@ -1831,8 +1875,9 @@ $a->strings["Inbox"] = "收件箱";
 $a->strings["Outbox"] = "发件箱";
 $a->strings["Manage"] = "管理";
 $a->strings["Manage other pages"] = "管理别的页";
+$a->strings["Delegations"] = "";
 $a->strings["Profiles"] = "简介";
-$a->strings["Manage/edit profiles"] = "管理/修改简介";
+$a->strings["Manage/Edit Profiles"] = "";
 $a->strings["Manage/edit friends and contacts"] = "管理/编朋友们和熟人们";
 $a->strings["Site setup and configuration"] = "网站开办和配置";
 $a->strings["Nothing new here"] = "这里没有什么新的";
@@ -1871,10 +1916,47 @@ $a->strings["seconds"] = "秒";
 $a->strings["%1\$d %2\$s ago"] = "%1\$d %2\$s以前";
 $a->strings["%s's birthday"] = "";
 $a->strings["Happy Birthday %s"] = "";
-$a->strings["From: "] = "从:";
 $a->strings["Image/photo"] = "图像/照片";
+$a->strings["<span><a href=\"%s\" target=\"external-link\">%s</a> wrote the following <a href=\"%s\" target=\"external-link\">post</a>:</span>"] = "";
 $a->strings["$1 wrote:"] = "$1写:";
 $a->strings["Encrypted content"] = "";
+$a->strings["General Features"] = "";
+$a->strings["Multiple Profiles"] = "";
+$a->strings["Ability to create multiple profiles"] = "";
+$a->strings["Post Composition Features"] = "";
+$a->strings["Richtext Editor"] = "";
+$a->strings["Enable richtext editor"] = "";
+$a->strings["Post Preview"] = "";
+$a->strings["Allow previewing posts and comments before publishing them"] = "";
+$a->strings["Network Sidebar Widgets"] = "";
+$a->strings["Search by Date"] = "";
+$a->strings["Ability to select posts by date ranges"] = "";
+$a->strings["Group Filter"] = "";
+$a->strings["Enable widget to display Network posts only from selected group"] = "";
+$a->strings["Network Filter"] = "";
+$a->strings["Enable widget to display Network posts only from selected network"] = "";
+$a->strings["Save search terms for re-use"] = "";
+$a->strings["Network Tabs"] = "";
+$a->strings["Network Personal Tab"] = "";
+$a->strings["Enable tab to display only Network posts that you've interacted on"] = "";
+$a->strings["Network New Tab"] = "";
+$a->strings["Enable tab to display only new Network posts (from the last 12 hours)"] = "";
+$a->strings["Network Shared Links Tab"] = "";
+$a->strings["Enable tab to display only Network posts with links in them"] = "";
+$a->strings["Post/Comment Tools"] = "";
+$a->strings["Multiple Deletion"] = "";
+$a->strings["Select and delete multiple posts/comments at once"] = "";
+$a->strings["Edit Sent Posts"] = "";
+$a->strings["Edit and correct posts and comments after sending"] = "";
+$a->strings["Tagging"] = "";
+$a->strings["Ability to tag existing posts"] = "";
+$a->strings["Post Categories"] = "";
+$a->strings["Add categories to your posts"] = "";
+$a->strings["Ability to file posts under folders"] = "";
+$a->strings["Dislike Posts"] = "";
+$a->strings["Ability to dislike posts/comments"] = "";
+$a->strings["Star Posts"] = "";
+$a->strings["Ability to mark special posts with a star indicator"] = "";
 $a->strings["Cannot locate DNS info for database server '%s'"] = "找不到DNS信息为数据库服务器「%s」";
 $a->strings["[no subject]"] = "[无题目]";
 $a->strings["Visible to everybody"] = "任何人可见的";
@@ -1969,8 +2051,9 @@ $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["<span  %1\$s>%2\$d people</span> like this."] = "<span  %1\$s>%2\$d人</span>喜欢这个。";
-$a->strings["<span  %1\$s>%2\$d people</span> don't like this."] = "<span  %1\$s>%2\$d人</span>不喜欢这个。";
+$a->strings["like this"] = "";
+$a->strings["don't like this"] = "";
+$a->strings["people"] = "";
 $a->strings["and"] = "和";
 $a->strings[", and %d other people"] = ",和%d别人";
 $a->strings["%s like this."] = "%s喜欢这个";
@@ -1993,11 +2076,16 @@ $a->strings["Create a New Account"] = "创造新的账户";
 $a->strings["Nickname or Email address: "] = "绰号或电子邮件地址: ";
 $a->strings["Password: "] = "密码: ";
 $a->strings["Remember me"] = "";
-$a->strings["Or login using OpenID: "] = "";
+$a->strings["Or login using OpenID: "] = "或者用OpenID登记:";
 $a->strings["Forgot your password?"] = "忘记你的密码吗?";
+$a->strings["Website Terms of Service"] = "";
+$a->strings["terms of service"] = "";
+$a->strings["Website Privacy Policy"] = "";
+$a->strings["privacy policy"] = "";
 $a->strings["Requested account is not available."] = "";
 $a->strings["Edit profile"] = "修改简介";
 $a->strings["Message"] = "";
+$a->strings["Manage/edit profiles"] = "管理/修改简介";
 $a->strings["g A l F d"] = "g A l d F";
 $a->strings["F d"] = "F d";
 $a->strings["[today]"] = "[今天]";
@@ -2026,3 +2114,5 @@ $a->strings["Post to Drupal by default"] = "";
 $a->strings["OEmbed settings updated"] = "OEmbed设置更新了";
 $a->strings["Use OEmbed for YouTube videos"] = "用OEmbed为YouTube视频";
 $a->strings["URL to embed:"] = "URL要嵌入:";
+$a->strings["Tumblr login"] = "Tumblr登记名";
+$a->strings["Tumblr password"] = "Tumblr密码";