diff --git a/view/zh-cn/messages.po b/view/zh-cn/messages.po
index be5909293f..387d4f8dcd 100644
--- a/view/zh-cn/messages.po
+++ b/view/zh-cn/messages.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
-"POT-Creation-Date: 2013-04-25 00:02-0700\n"
-"PO-Revision-Date: 2013-04-28 09:36+0000\n"
-"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"POT-Creation-Date: 2013-06-12 00:01-0700\n"
+"PO-Revision-Date: 2013-06-07 13:45+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,7 +23,7 @@ msgstr ""
 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:84
 #: ../../include/nav.php:77 ../../mod/profperm.php:103
 #: ../../mod/newmember.php:32 ../../view/theme/diabook/theme.php:88
-#: ../../boot.php:1945
+#: ../../boot.php:1947
 msgid "Profile"
 msgstr "简介"
 
@@ -32,7 +32,7 @@ msgid "Full Name:"
 msgstr "全名："
 
 #: ../../include/profile_advanced.php:17 ../../mod/directory.php:136
-#: ../../boot.php:1485
+#: ../../boot.php:1487
 msgid "Gender:"
 msgstr "性别:"
 
@@ -53,7 +53,7 @@ msgid "Age:"
 msgstr "年纪："
 
 #: ../../include/profile_advanced.php:37 ../../mod/directory.php:138
-#: ../../boot.php:1488
+#: ../../boot.php:1490
 msgid "Status:"
 msgstr "现状:"
 
@@ -67,7 +67,7 @@ msgid "Sexual Preference:"
 msgstr "性取向"
 
 #: ../../include/profile_advanced.php:48 ../../mod/directory.php:140
-#: ../../boot.php:1490
+#: ../../boot.php:1492
 msgid "Homepage:"
 msgstr "主页:"
 
@@ -372,337 +372,56 @@ msgstr "问我"
 msgid "stopped following"
 msgstr "结束关注了"
 
-#: ../../include/Contact.php:225 ../../include/conversation.php:838
+#: ../../include/Contact.php:225 ../../include/conversation.php:878
 msgid "Poke"
 msgstr "戳"
 
-#: ../../include/Contact.php:226 ../../include/conversation.php:832
+#: ../../include/Contact.php:226 ../../include/conversation.php:872
 msgid "View Status"
 msgstr "看现状"
 
-#: ../../include/Contact.php:227 ../../include/conversation.php:833
+#: ../../include/Contact.php:227 ../../include/conversation.php:873
 msgid "View Profile"
 msgstr "看简介"
 
-#: ../../include/Contact.php:228 ../../include/conversation.php:834
+#: ../../include/Contact.php:228 ../../include/conversation.php:874
 msgid "View Photos"
 msgstr "看照片"
 
 #: ../../include/Contact.php:229 ../../include/Contact.php:251
-#: ../../include/conversation.php:835
+#: ../../include/conversation.php:875
 msgid "Network Posts"
 msgstr "网络文章"
 
 #: ../../include/Contact.php:230 ../../include/Contact.php:251
-#: ../../include/conversation.php:836
+#: ../../include/conversation.php:876
 msgid "Edit Contact"
 msgstr "编辑熟人"
 
 #: ../../include/Contact.php:231 ../../include/Contact.php:251
-#: ../../include/conversation.php:837
+#: ../../include/conversation.php:877
 msgid "Send PM"
 msgstr "法私人的新闻"
 
-#: ../../include/text.php:294
-msgid "prev"
-msgstr "上个"
+#: ../../include/bbcode.php:210 ../../include/bbcode.php:550
+#: ../../include/bbcode.php:551
+msgid "Image/photo"
+msgstr "图像／照片"
 
-#: ../../include/text.php:296
-msgid "first"
-msgstr "首先"
-
-#: ../../include/text.php:325
-msgid "last"
-msgstr "最后"
-
-#: ../../include/text.php:328
-msgid "next"
-msgstr "下个"
-
-#: ../../include/text.php:352
-msgid "newer"
-msgstr "更新"
-
-#: ../../include/text.php:356
-msgid "older"
-msgstr "更旧"
-
-#: ../../include/text.php:807
-msgid "No contacts"
-msgstr "没有熟人"
-
-#: ../../include/text.php:816
+#: ../../include/bbcode.php:272
 #, php-format
-msgid "%d Contact"
-msgid_plural "%d Contacts"
-msgstr[0] "%d熟人"
-
-#: ../../include/text.php:828 ../../mod/viewcontacts.php:76
-msgid "View Contacts"
-msgstr "看熟人"
-
-#: ../../include/text.php:905 ../../include/text.php:906
-#: ../../include/nav.php:118 ../../mod/search.php:99
-msgid "Search"
-msgstr "搜索"
-
-#: ../../include/text.php:908 ../../mod/notes.php:63 ../../mod/filer.php:31
-msgid "Save"
-msgstr "保存"
-
-#: ../../include/text.php:957
-msgid "poke"
-msgstr "戳"
-
-#: ../../include/text.php:957 ../../include/conversation.php:211
-msgid "poked"
-msgstr "戳了"
-
-#: ../../include/text.php:958
-msgid "ping"
-msgstr "砰"
-
-#: ../../include/text.php:958
-msgid "pinged"
-msgstr "砰了"
-
-#: ../../include/text.php:959
-msgid "prod"
-msgstr "柔戳"
-
-#: ../../include/text.php:959
-msgid "prodded"
-msgstr "柔戳了"
-
-#: ../../include/text.php:960
-msgid "slap"
-msgstr "掌击"
-
-#: ../../include/text.php:960
-msgid "slapped"
-msgstr "掌击了"
-
-#: ../../include/text.php:961
-msgid "finger"
-msgstr "指"
-
-#: ../../include/text.php:961
-msgid "fingered"
-msgstr "指了"
-
-#: ../../include/text.php:962
-msgid "rebuff"
-msgstr "窝脖儿"
-
-#: ../../include/text.php:962
-msgid "rebuffed"
-msgstr "窝脖儿了"
-
-#: ../../include/text.php:976
-msgid "happy"
-msgstr "开心"
-
-#: ../../include/text.php:977
-msgid "sad"
-msgstr "伤心"
-
-#: ../../include/text.php:978
-msgid "mellow"
-msgstr "轻松"
-
-#: ../../include/text.php:979
-msgid "tired"
-msgstr "累"
-
-#: ../../include/text.php:980
-msgid "perky"
-msgstr "机敏"
-
-#: ../../include/text.php:981
-msgid "angry"
-msgstr "生气"
-
-#: ../../include/text.php:982
-msgid "stupified"
-msgstr "麻醉"
-
-#: ../../include/text.php:983
-msgid "puzzled"
-msgstr "纳闷"
-
-#: ../../include/text.php:984
-msgid "interested"
-msgstr "有兴趣"
-
-#: ../../include/text.php:985
-msgid "bitter"
-msgstr "苦"
-
-#: ../../include/text.php:986
-msgid "cheerful"
-msgstr "快乐"
-
-#: ../../include/text.php:987
-msgid "alive"
-msgstr "活着"
-
-#: ../../include/text.php:988
-msgid "annoyed"
-msgstr "被烦恼"
-
-#: ../../include/text.php:989
-msgid "anxious"
-msgstr "心焦"
-
-#: ../../include/text.php:990
-msgid "cranky"
-msgstr "不稳"
-
-#: ../../include/text.php:991
-msgid "disturbed"
-msgstr "不安"
-
-#: ../../include/text.php:992
-msgid "frustrated"
-msgstr "被作梗"
-
-#: ../../include/text.php:993
-msgid "motivated"
-msgstr "士气高涨"
-
-#: ../../include/text.php:994
-msgid "relaxed"
-msgstr "轻松"
-
-#: ../../include/text.php:995
-msgid "surprised"
-msgstr "诧异"
-
-#: ../../include/text.php:1161
-msgid "Monday"
-msgstr "星期一"
-
-#: ../../include/text.php:1161
-msgid "Tuesday"
-msgstr "星期二"
-
-#: ../../include/text.php:1161
-msgid "Wednesday"
-msgstr "星期三"
-
-#: ../../include/text.php:1161
-msgid "Thursday"
-msgstr "星期四"
-
-#: ../../include/text.php:1161
-msgid "Friday"
-msgstr "星期五"
-
-#: ../../include/text.php:1161
-msgid "Saturday"
-msgstr "星期六"
-
-#: ../../include/text.php:1161
-msgid "Sunday"
-msgstr "星期天"
-
-#: ../../include/text.php:1165
-msgid "January"
-msgstr "一月"
-
-#: ../../include/text.php:1165
-msgid "February"
-msgstr "二月"
-
-#: ../../include/text.php:1165
-msgid "March"
-msgstr "三月"
-
-#: ../../include/text.php:1165
-msgid "April"
-msgstr "四月"
-
-#: ../../include/text.php:1165
-msgid "May"
-msgstr "五月"
-
-#: ../../include/text.php:1165
-msgid "June"
-msgstr "六月"
-
-#: ../../include/text.php:1165
-msgid "July"
-msgstr "七月"
-
-#: ../../include/text.php:1165
-msgid "August"
-msgstr "八月"
-
-#: ../../include/text.php:1165
-msgid "September"
-msgstr "九月"
-
-#: ../../include/text.php:1165
-msgid "October"
-msgstr "十月"
-
-#: ../../include/text.php:1165
-msgid "November"
-msgstr "十一月"
-
-#: ../../include/text.php:1165
-msgid "December"
-msgstr "十二月"
-
-#: ../../include/text.php:1322
-msgid "bytes"
-msgstr "字节"
-
-#: ../../include/text.php:1349 ../../include/text.php:1361
-msgid "Click to open/close"
-msgstr "点击为开关"
-
-#: ../../include/text.php:1523 ../../mod/events.php:335
-msgid "link to source"
-msgstr "链接到来源"
-
-#: ../../include/text.php:1566 ../../include/user.php:237
-msgid "default"
-msgstr "默认"
-
-#: ../../include/text.php:1578
-msgid "Select an alternate language"
-msgstr "选择别的语言"
-
-#: ../../include/text.php:1830 ../../include/conversation.php:118
-#: ../../include/conversation.php:246 ../../view/theme/diabook/theme.php:456
-msgid "event"
-msgstr "项目"
-
-#: ../../include/text.php:1832 ../../include/diaspora.php:1874
-#: ../../include/conversation.php:126 ../../include/conversation.php:254
-#: ../../mod/subthread.php:87 ../../mod/tagger.php:62 ../../mod/like.php:151
-#: ../../view/theme/diabook/theme.php:464
-msgid "photo"
-msgstr "照片"
-
-#: ../../include/text.php:1834
-msgid "activity"
-msgstr "活动"
-
-#: ../../include/text.php:1836 ../../mod/content.php:628
-#: ../../object/Item.php:364 ../../object/Item.php:377
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "评论"
-
-#: ../../include/text.php:1837
-msgid "post"
-msgstr "文章"
-
-#: ../../include/text.php:1992
-msgid "Item filed"
-msgstr "把项目归档了"
+msgid ""
+"<span><a href=\"%s\" target=\"external-link\">%s</a> wrote the following <a "
+"href=\"%s\" target=\"external-link\">post</a>"
+msgstr "<span><a href=\"%s\" target=\"external-link\">%s</a>写了下面的<a href=\"%s\" target=\"external-link\">文章</a>"
+
+#: ../../include/bbcode.php:514 ../../include/bbcode.php:534
+msgid "$1 wrote:"
+msgstr "$1写："
+
+#: ../../include/bbcode.php:559 ../../include/bbcode.php:560
+msgid "Encrypted content"
+msgstr "加密的内容"
 
 #: ../../include/acl_selectors.php:325
 msgid "Visible to everybody"
@@ -751,7 +470,7 @@ msgid "Finishes:"
 msgstr "结束："
 
 #: ../../include/bb2diaspora.php:415 ../../include/event.php:40
-#: ../../mod/directory.php:134 ../../mod/events.php:471 ../../boot.php:1483
+#: ../../mod/directory.php:134 ../../mod/events.php:471 ../../boot.php:1485
 msgid "Location:"
 msgstr "位置:"
 
@@ -878,6 +597,10 @@ msgstr "要紧错误：产生安全钥匙失败了。"
 msgid "An error occurred during registration. Please try again."
 msgstr "报到出了问题。请再试。"
 
+#: ../../include/user.php:237 ../../include/text.php:1596
+msgid "default"
+msgstr "默认"
+
 #: ../../include/user.php:247
 msgid "An error occurred creating your default profile. Please try again."
 msgstr "造成默认简介出了问题。请再试。"
@@ -1001,7 +724,7 @@ msgid "Example: bob@example.com, http://example.com/barbara"
 msgstr "比如：li@example.com, http://example.com/li"
 
 #: ../../include/contact_widgets.php:9 ../../mod/suggest.php:88
-#: ../../mod/match.php:58 ../../boot.php:1415
+#: ../../mod/match.php:58 ../../boot.php:1417
 msgid "Connect"
 msgstr "连接"
 
@@ -1076,7 +799,7 @@ msgid_plural "%d contacts in common"
 msgstr[0] "%d共同熟人"
 
 #: ../../include/contact_widgets.php:204 ../../mod/content.php:629
-#: ../../object/Item.php:365 ../../boot.php:669
+#: ../../object/Item.php:365 ../../boot.php:671
 msgid "show more"
 msgstr "看多"
 
@@ -1084,26 +807,7 @@ msgstr "看多"
 msgid " on Last.fm"
 msgstr "在Last.fm"
 
-#: ../../include/bbcode.php:210 ../../include/bbcode.php:545
-msgid "Image/photo"
-msgstr "图像／照片"
-
-#: ../../include/bbcode.php:272
-#, php-format
-msgid ""
-"<span><a href=\"%s\" target=\"external-link\">%s</a> wrote the following <a "
-"href=\"%s\" target=\"external-link\">post</a>"
-msgstr "<span><a href=\"%s\" target=\"external-link\">%s</a>写了下面的<a href=\"%s\" target=\"external-link\">文章</a>"
-
-#: ../../include/bbcode.php:510 ../../include/bbcode.php:530
-msgid "$1 wrote:"
-msgstr "$1写："
-
-#: ../../include/bbcode.php:553 ../../include/bbcode.php:554
-msgid "Encrypted content"
-msgstr "加密的内容"
-
-#: ../../include/network.php:875
+#: ../../include/network.php:877
 msgid "view full size"
 msgstr "看全尺寸"
 
@@ -1221,6 +925,13 @@ msgstr "%1$s是成为%2$s的朋友"
 msgid "Sharing notification from Diaspora network"
 msgstr "分享通知从Diaspora网络"
 
+#: ../../include/diaspora.php:1874 ../../include/text.php:1862
+#: ../../include/conversation.php:126 ../../include/conversation.php:254
+#: ../../mod/subthread.php:87 ../../mod/tagger.php:62 ../../mod/like.php:151
+#: ../../view/theme/diabook/theme.php:464
+msgid "photo"
+msgstr "照片"
+
 #: ../../include/diaspora.php:1874 ../../include/conversation.php:121
 #: ../../include/conversation.php:130 ../../include/conversation.php:249
 #: ../../include/conversation.php:258 ../../mod/subthread.php:87
@@ -1275,7 +986,7 @@ msgstr "您真的想删除这个项目吗？"
 msgid "Yes"
 msgstr "是"
 
-#: ../../include/items.php:4023 ../../include/conversation.php:1080
+#: ../../include/items.php:4023 ../../include/conversation.php:1120
 #: ../../mod/contacts.php:249 ../../mod/settings.php:585
 #: ../../mod/settings.php:611 ../../mod/dfrn_request.php:848
 #: ../../mod/suggest.php:32 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
@@ -1287,7 +998,7 @@ msgstr "退消"
 
 #: ../../include/items.php:4143 ../../mod/profiles.php:146
 #: ../../mod/profiles.php:571 ../../mod/notes.php:20 ../../mod/display.php:242
-#: ../../mod/nogroup.php:25 ../../mod/item.php:140 ../../mod/item.php:156
+#: ../../mod/nogroup.php:25 ../../mod/item.php:143 ../../mod/item.php:159
 #: ../../mod/allfriends.php:9 ../../mod/api.php:26 ../../mod/api.php:31
 #: ../../mod/register.php:40 ../../mod/regmod.php:118 ../../mod/attach.php:33
 #: ../../mod/contacts.php:147 ../../mod/settings.php:91
@@ -1472,6 +1183,300 @@ msgstr "能把优秀文章跟星标注"
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr "找不到DNS信息为数据库服务器「%s」"
 
+#: ../../include/text.php:294
+msgid "prev"
+msgstr "上个"
+
+#: ../../include/text.php:296
+msgid "first"
+msgstr "首先"
+
+#: ../../include/text.php:325
+msgid "last"
+msgstr "最后"
+
+#: ../../include/text.php:328
+msgid "next"
+msgstr "下个"
+
+#: ../../include/text.php:352
+msgid "newer"
+msgstr "更新"
+
+#: ../../include/text.php:356
+msgid "older"
+msgstr "更旧"
+
+#: ../../include/text.php:807
+msgid "No contacts"
+msgstr "没有熟人"
+
+#: ../../include/text.php:816
+#, php-format
+msgid "%d Contact"
+msgid_plural "%d Contacts"
+msgstr[0] "%d熟人"
+
+#: ../../include/text.php:828 ../../mod/viewcontacts.php:76
+msgid "View Contacts"
+msgstr "看熟人"
+
+#: ../../include/text.php:905 ../../include/text.php:906
+#: ../../include/nav.php:118 ../../mod/search.php:99
+msgid "Search"
+msgstr "搜索"
+
+#: ../../include/text.php:908 ../../mod/notes.php:63 ../../mod/filer.php:31
+msgid "Save"
+msgstr "保存"
+
+#: ../../include/text.php:957
+msgid "poke"
+msgstr "戳"
+
+#: ../../include/text.php:957 ../../include/conversation.php:211
+msgid "poked"
+msgstr "戳了"
+
+#: ../../include/text.php:958
+msgid "ping"
+msgstr "砰"
+
+#: ../../include/text.php:958
+msgid "pinged"
+msgstr "砰了"
+
+#: ../../include/text.php:959
+msgid "prod"
+msgstr "柔戳"
+
+#: ../../include/text.php:959
+msgid "prodded"
+msgstr "柔戳了"
+
+#: ../../include/text.php:960
+msgid "slap"
+msgstr "掌击"
+
+#: ../../include/text.php:960
+msgid "slapped"
+msgstr "掌击了"
+
+#: ../../include/text.php:961
+msgid "finger"
+msgstr "指"
+
+#: ../../include/text.php:961
+msgid "fingered"
+msgstr "指了"
+
+#: ../../include/text.php:962
+msgid "rebuff"
+msgstr "窝脖儿"
+
+#: ../../include/text.php:962
+msgid "rebuffed"
+msgstr "窝脖儿了"
+
+#: ../../include/text.php:976
+msgid "happy"
+msgstr "开心"
+
+#: ../../include/text.php:977
+msgid "sad"
+msgstr "伤心"
+
+#: ../../include/text.php:978
+msgid "mellow"
+msgstr "轻松"
+
+#: ../../include/text.php:979
+msgid "tired"
+msgstr "累"
+
+#: ../../include/text.php:980
+msgid "perky"
+msgstr "机敏"
+
+#: ../../include/text.php:981
+msgid "angry"
+msgstr "生气"
+
+#: ../../include/text.php:982
+msgid "stupified"
+msgstr "麻醉"
+
+#: ../../include/text.php:983
+msgid "puzzled"
+msgstr "纳闷"
+
+#: ../../include/text.php:984
+msgid "interested"
+msgstr "有兴趣"
+
+#: ../../include/text.php:985
+msgid "bitter"
+msgstr "苦"
+
+#: ../../include/text.php:986
+msgid "cheerful"
+msgstr "快乐"
+
+#: ../../include/text.php:987
+msgid "alive"
+msgstr "活着"
+
+#: ../../include/text.php:988
+msgid "annoyed"
+msgstr "被烦恼"
+
+#: ../../include/text.php:989
+msgid "anxious"
+msgstr "心焦"
+
+#: ../../include/text.php:990
+msgid "cranky"
+msgstr "不稳"
+
+#: ../../include/text.php:991
+msgid "disturbed"
+msgstr "不安"
+
+#: ../../include/text.php:992
+msgid "frustrated"
+msgstr "被作梗"
+
+#: ../../include/text.php:993
+msgid "motivated"
+msgstr "士气高涨"
+
+#: ../../include/text.php:994
+msgid "relaxed"
+msgstr "轻松"
+
+#: ../../include/text.php:995
+msgid "surprised"
+msgstr "诧异"
+
+#: ../../include/text.php:1163
+msgid "Monday"
+msgstr "星期一"
+
+#: ../../include/text.php:1163
+msgid "Tuesday"
+msgstr "星期二"
+
+#: ../../include/text.php:1163
+msgid "Wednesday"
+msgstr "星期三"
+
+#: ../../include/text.php:1163
+msgid "Thursday"
+msgstr "星期四"
+
+#: ../../include/text.php:1163
+msgid "Friday"
+msgstr "星期五"
+
+#: ../../include/text.php:1163
+msgid "Saturday"
+msgstr "星期六"
+
+#: ../../include/text.php:1163
+msgid "Sunday"
+msgstr "星期天"
+
+#: ../../include/text.php:1167
+msgid "January"
+msgstr "一月"
+
+#: ../../include/text.php:1167
+msgid "February"
+msgstr "二月"
+
+#: ../../include/text.php:1167
+msgid "March"
+msgstr "三月"
+
+#: ../../include/text.php:1167
+msgid "April"
+msgstr "四月"
+
+#: ../../include/text.php:1167
+msgid "May"
+msgstr "五月"
+
+#: ../../include/text.php:1167
+msgid "June"
+msgstr "六月"
+
+#: ../../include/text.php:1167
+msgid "July"
+msgstr "七月"
+
+#: ../../include/text.php:1167
+msgid "August"
+msgstr "八月"
+
+#: ../../include/text.php:1167
+msgid "September"
+msgstr "九月"
+
+#: ../../include/text.php:1167
+msgid "October"
+msgstr "十月"
+
+#: ../../include/text.php:1167
+msgid "November"
+msgstr "十一月"
+
+#: ../../include/text.php:1167
+msgid "December"
+msgstr "十二月"
+
+#: ../../include/text.php:1323 ../../mod/videos.php:301
+msgid "View Video"
+msgstr "看视频"
+
+#: ../../include/text.php:1355
+msgid "bytes"
+msgstr "字节"
+
+#: ../../include/text.php:1379 ../../include/text.php:1391
+msgid "Click to open/close"
+msgstr "点击为开关"
+
+#: ../../include/text.php:1553 ../../mod/events.php:335
+msgid "link to source"
+msgstr "链接到来源"
+
+#: ../../include/text.php:1608
+msgid "Select an alternate language"
+msgstr "选择别的语言"
+
+#: ../../include/text.php:1860 ../../include/conversation.php:118
+#: ../../include/conversation.php:246 ../../view/theme/diabook/theme.php:456
+msgid "event"
+msgstr "项目"
+
+#: ../../include/text.php:1864
+msgid "activity"
+msgstr "活动"
+
+#: ../../include/text.php:1866 ../../mod/content.php:628
+#: ../../object/Item.php:364 ../../object/Item.php:377
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "评论"
+
+#: ../../include/text.php:1867
+msgid "post"
+msgstr "文章"
+
+#: ../../include/text.php:2022
+msgid "Item filed"
+msgstr "把项目归档了"
+
 #: ../../include/group.php:25
 msgid ""
 "A deleted group with this name was revived. Existing item permissions "
@@ -1540,44 +1545,44 @@ msgstr "文章／项目"
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr "%1$s标注%2$s的%3$s为偏爱"
 
-#: ../../include/conversation.php:587 ../../mod/content.php:461
+#: ../../include/conversation.php:612 ../../mod/content.php:461
 #: ../../mod/content.php:763 ../../object/Item.php:126
 msgid "Select"
 msgstr "选择"
 
-#: ../../include/conversation.php:588 ../../mod/admin.php:770
+#: ../../include/conversation.php:613 ../../mod/admin.php:770
 #: ../../mod/settings.php:647 ../../mod/group.php:171
 #: ../../mod/photos.php:1637 ../../mod/content.php:462
 #: ../../mod/content.php:764 ../../object/Item.php:127
 msgid "Delete"
 msgstr "删除"
 
-#: ../../include/conversation.php:627 ../../mod/content.php:495
+#: ../../include/conversation.php:652 ../../mod/content.php:495
 #: ../../mod/content.php:875 ../../mod/content.php:876
 #: ../../object/Item.php:306 ../../object/Item.php:307
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr "看%s的简介@ %s"
 
-#: ../../include/conversation.php:639 ../../object/Item.php:297
+#: ../../include/conversation.php:664 ../../object/Item.php:297
 msgid "Categories:"
 msgstr "种类："
 
-#: ../../include/conversation.php:640 ../../object/Item.php:298
+#: ../../include/conversation.php:665 ../../object/Item.php:298
 msgid "Filed under:"
 msgstr "归档在："
 
-#: ../../include/conversation.php:647 ../../mod/content.php:505
+#: ../../include/conversation.php:672 ../../mod/content.php:505
 #: ../../mod/content.php:887 ../../object/Item.php:320
 #, php-format
 msgid "%s from %s"
 msgstr "%s从%s"
 
-#: ../../include/conversation.php:662 ../../mod/content.php:520
+#: ../../include/conversation.php:687 ../../mod/content.php:520
 msgid "View in context"
 msgstr "看在上下文"
 
-#: ../../include/conversation.php:664 ../../include/conversation.php:1060
+#: ../../include/conversation.php:689 ../../include/conversation.php:1100
 #: ../../mod/editpost.php:124 ../../mod/wallmessage.php:156
 #: ../../mod/message.php:334 ../../mod/message.php:565
 #: ../../mod/photos.php:1532 ../../mod/content.php:522
@@ -1585,205 +1590,205 @@ msgstr "看在上下文"
 msgid "Please wait"
 msgstr "请等一下"
 
-#: ../../include/conversation.php:728
+#: ../../include/conversation.php:768
 msgid "remove"
 msgstr "删除"
 
-#: ../../include/conversation.php:732
+#: ../../include/conversation.php:772
 msgid "Delete Selected Items"
 msgstr "删除选的项目"
 
-#: ../../include/conversation.php:831
+#: ../../include/conversation.php:871
 msgid "Follow Thread"
 msgstr "关注线绳"
 
-#: ../../include/conversation.php:900
+#: ../../include/conversation.php:940
 #, php-format
 msgid "%s likes this."
 msgstr "%s喜欢这个."
 
-#: ../../include/conversation.php:900
+#: ../../include/conversation.php:940
 #, php-format
 msgid "%s doesn't like this."
 msgstr "%s没有喜欢这个."
 
-#: ../../include/conversation.php:905
+#: ../../include/conversation.php:945
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this"
 msgstr "<span  %1$s>%2$d人们</span>喜欢这个"
 
-#: ../../include/conversation.php:908
+#: ../../include/conversation.php:948
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this"
 msgstr "<span  %1$s>%2$d人们</span>不喜欢这个"
 
-#: ../../include/conversation.php:922
+#: ../../include/conversation.php:962
 msgid "and"
 msgstr "和"
 
-#: ../../include/conversation.php:928
+#: ../../include/conversation.php:968
 #, php-format
 msgid ", and %d other people"
 msgstr "，和%d别人"
 
-#: ../../include/conversation.php:930
+#: ../../include/conversation.php:970
 #, php-format
 msgid "%s like this."
 msgstr "%s喜欢这个"
 
-#: ../../include/conversation.php:930
+#: ../../include/conversation.php:970
 #, php-format
 msgid "%s don't like this."
 msgstr "%s不喜欢这个"
 
-#: ../../include/conversation.php:957 ../../include/conversation.php:975
+#: ../../include/conversation.php:997 ../../include/conversation.php:1015
 msgid "Visible to <strong>everybody</strong>"
 msgstr "<strong>大家</strong>可见的"
 
-#: ../../include/conversation.php:958 ../../include/conversation.php:976
+#: ../../include/conversation.php:998 ../../include/conversation.php:1016
 #: ../../mod/wallmessage.php:127 ../../mod/wallmessage.php:135
 #: ../../mod/message.php:283 ../../mod/message.php:291
 #: ../../mod/message.php:466 ../../mod/message.php:474
 msgid "Please enter a link URL:"
 msgstr "请输入环节URL："
 
-#: ../../include/conversation.php:959 ../../include/conversation.php:977
+#: ../../include/conversation.php:999 ../../include/conversation.php:1017
 msgid "Please enter a video link/URL:"
 msgstr "请输入视频连接／URL："
 
-#: ../../include/conversation.php:960 ../../include/conversation.php:978
+#: ../../include/conversation.php:1000 ../../include/conversation.php:1018
 msgid "Please enter an audio link/URL:"
 msgstr "请输入音响连接／URL："
 
-#: ../../include/conversation.php:961 ../../include/conversation.php:979
+#: ../../include/conversation.php:1001 ../../include/conversation.php:1019
 msgid "Tag term:"
 msgstr "标签:"
 
-#: ../../include/conversation.php:962 ../../include/conversation.php:980
+#: ../../include/conversation.php:1002 ../../include/conversation.php:1020
 #: ../../mod/filer.php:30
 msgid "Save to Folder:"
 msgstr "保存再文件夹："
 
-#: ../../include/conversation.php:963 ../../include/conversation.php:981
+#: ../../include/conversation.php:1003 ../../include/conversation.php:1021
 msgid "Where are you right now?"
 msgstr "你在哪里?"
 
-#: ../../include/conversation.php:964
+#: ../../include/conversation.php:1004
 msgid "Delete item(s)?"
 msgstr "把项目删除吗？"
 
-#: ../../include/conversation.php:1006
+#: ../../include/conversation.php:1046
 msgid "Post to Email"
 msgstr "电邮发布"
 
-#: ../../include/conversation.php:1041 ../../mod/photos.php:1531
+#: ../../include/conversation.php:1081 ../../mod/photos.php:1531
 msgid "Share"
 msgstr "分享"
 
-#: ../../include/conversation.php:1042 ../../mod/editpost.php:110
+#: ../../include/conversation.php:1082 ../../mod/editpost.php:110
 #: ../../mod/wallmessage.php:154 ../../mod/message.php:332
 #: ../../mod/message.php:562
 msgid "Upload photo"
 msgstr "上传照片"
 
-#: ../../include/conversation.php:1043 ../../mod/editpost.php:111
+#: ../../include/conversation.php:1083 ../../mod/editpost.php:111
 msgid "upload photo"
 msgstr "上传照片"
 
-#: ../../include/conversation.php:1044 ../../mod/editpost.php:112
+#: ../../include/conversation.php:1084 ../../mod/editpost.php:112
 msgid "Attach file"
 msgstr "附上文件"
 
-#: ../../include/conversation.php:1045 ../../mod/editpost.php:113
+#: ../../include/conversation.php:1085 ../../mod/editpost.php:113
 msgid "attach file"
 msgstr "附上文件"
 
-#: ../../include/conversation.php:1046 ../../mod/editpost.php:114
+#: ../../include/conversation.php:1086 ../../mod/editpost.php:114
 #: ../../mod/wallmessage.php:155 ../../mod/message.php:333
 #: ../../mod/message.php:563
 msgid "Insert web link"
 msgstr "插入网页环节"
 
-#: ../../include/conversation.php:1047 ../../mod/editpost.php:115
+#: ../../include/conversation.php:1087 ../../mod/editpost.php:115
 msgid "web link"
 msgstr "网页环节"
 
-#: ../../include/conversation.php:1048 ../../mod/editpost.php:116
+#: ../../include/conversation.php:1088 ../../mod/editpost.php:116
 msgid "Insert video link"
 msgstr "插入视频环节"
 
-#: ../../include/conversation.php:1049 ../../mod/editpost.php:117
+#: ../../include/conversation.php:1089 ../../mod/editpost.php:117
 msgid "video link"
 msgstr "视频环节"
 
-#: ../../include/conversation.php:1050 ../../mod/editpost.php:118
+#: ../../include/conversation.php:1090 ../../mod/editpost.php:118
 msgid "Insert audio link"
 msgstr "插入录音环节"
 
-#: ../../include/conversation.php:1051 ../../mod/editpost.php:119
+#: ../../include/conversation.php:1091 ../../mod/editpost.php:119
 msgid "audio link"
 msgstr "录音环节"
 
-#: ../../include/conversation.php:1052 ../../mod/editpost.php:120
+#: ../../include/conversation.php:1092 ../../mod/editpost.php:120
 msgid "Set your location"
 msgstr "设定您的位置"
 
-#: ../../include/conversation.php:1053 ../../mod/editpost.php:121
+#: ../../include/conversation.php:1093 ../../mod/editpost.php:121
 msgid "set location"
 msgstr "指定位置"
 
-#: ../../include/conversation.php:1054 ../../mod/editpost.php:122
+#: ../../include/conversation.php:1094 ../../mod/editpost.php:122
 msgid "Clear browser location"
 msgstr "清空浏览器位置"
 
-#: ../../include/conversation.php:1055 ../../mod/editpost.php:123
+#: ../../include/conversation.php:1095 ../../mod/editpost.php:123
 msgid "clear location"
 msgstr "清理出位置"
 
-#: ../../include/conversation.php:1057 ../../mod/editpost.php:137
+#: ../../include/conversation.php:1097 ../../mod/editpost.php:137
 msgid "Set title"
 msgstr "指定标题"
 
-#: ../../include/conversation.php:1059 ../../mod/editpost.php:139
+#: ../../include/conversation.php:1099 ../../mod/editpost.php:139
 msgid "Categories (comma-separated list)"
 msgstr "种类（逗号分隔单）"
 
-#: ../../include/conversation.php:1061 ../../mod/editpost.php:125
+#: ../../include/conversation.php:1101 ../../mod/editpost.php:125
 msgid "Permission settings"
 msgstr "权设置"
 
-#: ../../include/conversation.php:1062
+#: ../../include/conversation.php:1102
 msgid "permissions"
 msgstr "权利"
 
-#: ../../include/conversation.php:1070 ../../mod/editpost.php:133
+#: ../../include/conversation.php:1110 ../../mod/editpost.php:133
 msgid "CC: email addresses"
 msgstr "抄送: 电子邮件地址"
 
-#: ../../include/conversation.php:1071 ../../mod/editpost.php:134
+#: ../../include/conversation.php:1111 ../../mod/editpost.php:134
 msgid "Public post"
 msgstr "公开的消息"
 
-#: ../../include/conversation.php:1073 ../../mod/editpost.php:140
+#: ../../include/conversation.php:1113 ../../mod/editpost.php:140
 msgid "Example: bob@example.com, mary@example.com"
 msgstr "比如: li@example.com, wang@example.com"
 
-#: ../../include/conversation.php:1077 ../../mod/editpost.php:145
+#: ../../include/conversation.php:1117 ../../mod/editpost.php:145
 #: ../../mod/photos.php:1553 ../../mod/photos.php:1597
 #: ../../mod/photos.php:1680 ../../mod/content.php:742
 #: ../../object/Item.php:662
 msgid "Preview"
 msgstr "预演"
 
-#: ../../include/conversation.php:1086
+#: ../../include/conversation.php:1126
 msgid "Post to Groups"
 msgstr "发到组"
 
-#: ../../include/conversation.php:1087
+#: ../../include/conversation.php:1127
 msgid "Post to Contacts"
 msgstr "发到熟人"
 
-#: ../../include/conversation.php:1088
+#: ../../include/conversation.php:1128
 msgid "Private post"
 msgstr "私人文章"
 
@@ -1977,7 +1982,7 @@ msgstr "请批准或拒绝建议在%s"
 msgid "[no subject]"
 msgstr "[无题目]"
 
-#: ../../include/message.php:144 ../../mod/item.php:443
+#: ../../include/message.php:144 ../../mod/item.php:446
 #: ../../mod/wall_upload.php:135 ../../mod/wall_upload.php:144
 #: ../../mod/wall_upload.php:151
 msgid "Wall Photos"
@@ -1991,7 +1996,7 @@ msgstr "这里没有什么新的"
 msgid "Clear notifications"
 msgstr "清理出通知"
 
-#: ../../include/nav.php:73 ../../boot.php:1134
+#: ../../include/nav.php:73 ../../boot.php:1136
 msgid "Logout"
 msgstr "注销"
 
@@ -1999,7 +2004,7 @@ msgstr "注销"
 msgid "End this session"
 msgstr "结束这段时间"
 
-#: ../../include/nav.php:76 ../../boot.php:1938
+#: ../../include/nav.php:76 ../../boot.php:1940
 msgid "Status"
 msgstr "现状"
 
@@ -2013,7 +2018,7 @@ msgid "Your profile page"
 msgstr "你的简介页"
 
 #: ../../include/nav.php:78 ../../mod/fbrowser.php:25
-#: ../../view/theme/diabook/theme.php:90 ../../boot.php:1952
+#: ../../view/theme/diabook/theme.php:90 ../../boot.php:1954
 msgid "Photos"
 msgstr "照片"
 
@@ -2022,7 +2027,7 @@ msgid "Your photos"
 msgstr "你的照片"
 
 #: ../../include/nav.php:79 ../../mod/events.php:370
-#: ../../view/theme/diabook/theme.php:91 ../../boot.php:1962
+#: ../../view/theme/diabook/theme.php:91 ../../boot.php:1971
 msgid "Events"
 msgstr "事件"
 
@@ -2038,7 +2043,7 @@ msgstr "私人的便条"
 msgid "Your personal photos"
 msgstr "你私人的照片"
 
-#: ../../include/nav.php:91 ../../boot.php:1135
+#: ../../include/nav.php:91 ../../boot.php:1137
 msgid "Login"
 msgstr "登录"
 
@@ -2055,7 +2060,7 @@ msgstr "主页"
 msgid "Home Page"
 msgstr "主页"
 
-#: ../../include/nav.php:108 ../../mod/register.php:275 ../../boot.php:1110
+#: ../../include/nav.php:108 ../../mod/register.php:275 ../../boot.php:1112
 msgid "Register"
 msgstr "注册"
 
@@ -2184,7 +2189,7 @@ msgstr "配置"
 msgid "Account settings"
 msgstr "帐户配置"
 
-#: ../../include/nav.php:169 ../../boot.php:1437
+#: ../../include/nav.php:169 ../../boot.php:1439
 msgid "Profiles"
 msgstr "简介"
 
@@ -2582,23 +2587,23 @@ msgstr "年纪："
 msgid "Edit/Manage Profiles"
 msgstr "编辑／管理简介"
 
-#: ../../mod/profiles.php:726 ../../boot.php:1443 ../../boot.php:1469
+#: ../../mod/profiles.php:726 ../../boot.php:1445 ../../boot.php:1471
 msgid "Change profile photo"
 msgstr "换简介照片"
 
-#: ../../mod/profiles.php:727 ../../boot.php:1444
+#: ../../mod/profiles.php:727 ../../boot.php:1446
 msgid "Create New Profile"
 msgstr "创造新的简介"
 
-#: ../../mod/profiles.php:738 ../../boot.php:1454
+#: ../../mod/profiles.php:738 ../../boot.php:1456
 msgid "Profile Image"
 msgstr "简介图像"
 
-#: ../../mod/profiles.php:740 ../../boot.php:1457
+#: ../../mod/profiles.php:740 ../../boot.php:1459
 msgid "visible to everybody"
 msgstr "给打假可见的"
 
-#: ../../mod/profiles.php:741 ../../boot.php:1458
+#: ../../mod/profiles.php:741 ../../boot.php:1460
 msgid "Edit visibility"
 msgstr "修改能见度"
 
@@ -2626,14 +2631,14 @@ msgstr "能见被"
 msgid "All Contacts (with secure profile access)"
 msgstr "所有熟人(跟安全地简介使用权)"
 
-#: ../../mod/notes.php:44 ../../boot.php:1969
+#: ../../mod/notes.php:44 ../../boot.php:1978
 msgid "Personal Notes"
 msgstr "私人便条"
 
 #: ../../mod/display.php:19 ../../mod/search.php:89
 #: ../../mod/dfrn_request.php:761 ../../mod/directory.php:31
-#: ../../mod/viewcontacts.php:17 ../../mod/photos.php:914
-#: ../../mod/community.php:18
+#: ../../mod/videos.php:115 ../../mod/viewcontacts.php:17
+#: ../../mod/photos.php:914 ../../mod/community.php:18
 msgid "Public access denied."
 msgstr "公众看拒绝"
 
@@ -3500,37 +3505,37 @@ msgstr "FTP用户"
 msgid "FTP Password"
 msgstr "FTP密码"
 
-#: ../../mod/item.php:105
+#: ../../mod/item.php:108
 msgid "Unable to locate original post."
 msgstr "找不到当初的新闻"
 
-#: ../../mod/item.php:307
+#: ../../mod/item.php:310
 msgid "Empty post discarded."
 msgstr "空心的新闻丢弃了"
 
-#: ../../mod/item.php:869
+#: ../../mod/item.php:872
 msgid "System error. Post not saved."
 msgstr "系统错误。x"
 
-#: ../../mod/item.php:894
+#: ../../mod/item.php:897
 #, php-format
 msgid ""
 "This message was sent to you by %s, a member of the Friendica social "
 "network."
 msgstr "这个新闻是由%s，Friendica社会化网络成员之一，发给你。"
 
-#: ../../mod/item.php:896
+#: ../../mod/item.php:899
 #, php-format
 msgid "You may visit them online at %s"
 msgstr "你可以网上拜访他在%s"
 
-#: ../../mod/item.php:897
+#: ../../mod/item.php:900
 msgid ""
 "Please contact the sender by replying to this post if you do not wish to "
 "receive these messages."
 msgstr "你不想受到这些新闻的话，请回答这个新闻给发者联系。"
 
-#: ../../mod/item.php:901
+#: ../../mod/item.php:904
 #, php-format
 msgid "%s posted an update."
 msgstr "%s贴上一个新闻。"
@@ -5041,6 +5046,26 @@ msgstr "搜索人物"
 msgid "No matches"
 msgstr "没有结果"
 
+#: ../../mod/videos.php:125
+msgid "No videos selected"
+msgstr "没选择的视频"
+
+#: ../../mod/videos.php:226 ../../mod/photos.php:1025
+msgid "Access to this item is restricted."
+msgstr "这个项目使用权限的。"
+
+#: ../../mod/videos.php:308 ../../mod/photos.php:1784
+msgid "View Album"
+msgstr "看照片册"
+
+#: ../../mod/videos.php:317
+msgid "Recent Videos"
+msgstr "最近视频"
+
+#: ../../mod/videos.php:319
+msgid "Upload New Videos"
+msgstr "上传新视频"
+
 #: ../../mod/tagrm.php:41
 msgid "Tag removed"
 msgstr "标签去除了"
@@ -5544,7 +5569,7 @@ msgid ""
 "Password reset failed."
 msgstr "要求确认不了。(您可能已经提交它。)重设密码失败了。"
 
-#: ../../mod/lostpass.php:84 ../../boot.php:1149
+#: ../../mod/lostpass.php:84 ../../boot.php:1151
 msgid "Password Reset"
 msgstr "复位密码"
 
@@ -5928,7 +5953,7 @@ msgstr "没有别的家通信。"
 msgid "Home Notifications"
 msgstr "主页通知"
 
-#: ../../mod/photos.php:51 ../../boot.php:1955
+#: ../../mod/photos.php:51 ../../boot.php:1957
 msgid "Photo Albums"
 msgstr "相册"
 
@@ -5988,10 +6013,6 @@ msgstr "图片文件空的。"
 msgid "No photos selected"
 msgstr "没有照片挑选了"
 
-#: ../../mod/photos.php:1025
-msgid "Access to this item is restricted."
-msgstr "这个项目使用权限的。"
-
 #: ../../mod/photos.php:1088
 #, php-format
 msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
@@ -6129,14 +6150,10 @@ msgstr "这是你"
 
 #: ../../mod/photos.php:1551 ../../mod/photos.php:1595
 #: ../../mod/photos.php:1678 ../../mod/content.php:732
-#: ../../object/Item.php:338 ../../object/Item.php:652 ../../boot.php:668
+#: ../../object/Item.php:338 ../../object/Item.php:652 ../../boot.php:670
 msgid "Comment"
 msgstr "评论"
 
-#: ../../mod/photos.php:1784
-msgid "View Album"
-msgstr "看照片册"
-
 #: ../../mod/photos.php:1793
 msgid "Recent Photos"
 msgstr "最近的照片"
@@ -6322,7 +6339,7 @@ msgid ""
 " features and resources."
 msgstr "我们<strong>帮助</strong>页可查阅到详情关于别的编程特点和资源。"
 
-#: ../../mod/profile.php:21 ../../boot.php:1323
+#: ../../mod/profile.php:21 ../../boot.php:1325
 msgid "Requested profile is not available."
 msgstr "要求的简介联系不上的。"
 
@@ -6331,8 +6348,8 @@ msgid "Tips for New Members"
 msgstr "提示对新成员"
 
 #: ../../mod/install.php:117
-msgid "Friendica Social Communications Server - Setup"
-msgstr "Friendica社会交通服务器－安装"
+msgid "Friendica Communications Server - Setup"
+msgstr "Friendica沟通服务器－安装"
 
 #: ../../mod/install.php:123
 msgid "Could not connect to database."
@@ -6961,124 +6978,128 @@ msgstr "文本区字体大小"
 msgid "toggle mobile"
 msgstr "交替手机"
 
-#: ../../boot.php:667
+#: ../../boot.php:669
 msgid "Delete this item?"
 msgstr "删除这个项目？"
 
-#: ../../boot.php:670
+#: ../../boot.php:672
 msgid "show fewer"
 msgstr "显示更小"
 
-#: ../../boot.php:997
+#: ../../boot.php:999
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "更新%s美通过。看错误记录。"
 
-#: ../../boot.php:999
+#: ../../boot.php:1001
 #, php-format
 msgid "Update Error at %s"
 msgstr "更新错误在%s"
 
-#: ../../boot.php:1109
+#: ../../boot.php:1111
 msgid "Create a New Account"
 msgstr "创造新的账户"
 
-#: ../../boot.php:1137
+#: ../../boot.php:1139
 msgid "Nickname or Email address: "
 msgstr "绰号或电子邮件地址: "
 
-#: ../../boot.php:1138
+#: ../../boot.php:1140
 msgid "Password: "
 msgstr "密码: "
 
-#: ../../boot.php:1139
+#: ../../boot.php:1141
 msgid "Remember me"
 msgstr "记住我"
 
-#: ../../boot.php:1142
+#: ../../boot.php:1144
 msgid "Or login using OpenID: "
 msgstr "或者用OpenID登记："
 
-#: ../../boot.php:1148
+#: ../../boot.php:1150
 msgid "Forgot your password?"
 msgstr "忘记你的密码吗？"
 
-#: ../../boot.php:1151
+#: ../../boot.php:1153
 msgid "Website Terms of Service"
 msgstr "网站的各项规定"
 
-#: ../../boot.php:1152
+#: ../../boot.php:1154
 msgid "terms of service"
 msgstr "各项规定"
 
-#: ../../boot.php:1154
+#: ../../boot.php:1156
 msgid "Website Privacy Policy"
 msgstr "网站隐私政策"
 
-#: ../../boot.php:1155
+#: ../../boot.php:1157
 msgid "privacy policy"
 msgstr "隐私政策"
 
-#: ../../boot.php:1284
+#: ../../boot.php:1286
 msgid "Requested account is not available."
 msgstr "要求的账户不可用。"
 
-#: ../../boot.php:1363 ../../boot.php:1467
+#: ../../boot.php:1365 ../../boot.php:1469
 msgid "Edit profile"
 msgstr "修改简介"
 
-#: ../../boot.php:1429
+#: ../../boot.php:1431
 msgid "Message"
 msgstr "通知"
 
-#: ../../boot.php:1437
+#: ../../boot.php:1439
 msgid "Manage/edit profiles"
 msgstr "管理/修改简介"
 
-#: ../../boot.php:1566 ../../boot.php:1652
+#: ../../boot.php:1568 ../../boot.php:1654
 msgid "g A l F d"
 msgstr "g A l d F"
 
-#: ../../boot.php:1567 ../../boot.php:1653
+#: ../../boot.php:1569 ../../boot.php:1655
 msgid "F d"
 msgstr "F d"
 
-#: ../../boot.php:1612 ../../boot.php:1693
+#: ../../boot.php:1614 ../../boot.php:1695
 msgid "[today]"
 msgstr "[今天]"
 
-#: ../../boot.php:1624
+#: ../../boot.php:1626
 msgid "Birthday Reminders"
 msgstr "提醒生日"
 
-#: ../../boot.php:1625
+#: ../../boot.php:1627
 msgid "Birthdays this week:"
 msgstr "这周的生日:"
 
-#: ../../boot.php:1686
+#: ../../boot.php:1688
 msgid "[No description]"
 msgstr "[无描述]"
 
-#: ../../boot.php:1704
+#: ../../boot.php:1706
 msgid "Event Reminders"
 msgstr "事件提醒"
 
-#: ../../boot.php:1705
+#: ../../boot.php:1707
 msgid "Events this week:"
 msgstr "这周的事件:"
 
-#: ../../boot.php:1941
+#: ../../boot.php:1943
 msgid "Status Messages and Posts"
 msgstr "现状通知和文章"
 
-#: ../../boot.php:1948
+#: ../../boot.php:1950
 msgid "Profile Details"
 msgstr "简介内容"
 
-#: ../../boot.php:1965
+#: ../../boot.php:1961 ../../boot.php:1964
+msgid "Videos"
+msgstr "视频"
+
+#: ../../boot.php:1974
 msgid "Events and Calendar"
 msgstr "项目和日历"
 
-#: ../../boot.php:1972
+#: ../../boot.php:1981
 msgid "Only You Can See This"
 msgstr "只您许看这个"
diff --git a/view/zh-cn/strings.php b/view/zh-cn/strings.php
index da920f55dd..335b7511b2 100644
--- a/view/zh-cn/strings.php
+++ b/view/zh-cn/strings.php
@@ -98,6 +98,181 @@ $a->strings["View Photos"] = "看照片";
 $a->strings["Network Posts"] = "网络文章";
 $a->strings["Edit Contact"] = "编辑熟人";
 $a->strings["Send PM"] = "法私人的新闻";
+$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 href=\"%s\" target=\"external-link\">%s</a>写了下面的<a href=\"%s\" target=\"external-link\">文章</a>";
+$a->strings["$1 wrote:"] = "$1写：";
+$a->strings["Encrypted content"] = "加密的内容";
+$a->strings["Visible to everybody"] = "任何人可见的";
+$a->strings["show"] = "著";
+$a->strings["don't show"] = "别著";
+$a->strings["Logged out."] = "注销了";
+$a->strings["Login failed."] = "登记失败了。";
+$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "我们用您输入的OpenID登录的时候碰到问题。请核实拼法是对的。";
+$a->strings["The error message was:"] = "错误通知是：";
+$a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
+$a->strings["Starts:"] = "开始：";
+$a->strings["Finishes:"] = "结束：";
+$a->strings["Location:"] = "位置:";
+$a->strings["Disallowed profile URL."] = "不允许的简介地址.";
+$a->strings["Connect URL missing."] = "连接URL失踪的。";
+$a->strings["This site is not configured to allow communications with other networks."] = "这网站没配置允许跟别的网络交流.";
+$a->strings["No compatible communication protocols or feeds were discovered."] = "没有兼容协议或者摘要找到了.";
+$a->strings["The profile address specified does not provide adequate information."] = "输入的简介地址没有够消息。";
+$a->strings["An author or name was not found."] = "找不到作者或名。";
+$a->strings["No browser URL could be matched to this address."] = "这个地址没有符合什么游览器URL。";
+$a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "使不了知道的相配或邮件熟人相配 ";
+$a->strings["Use mailto: in front of address to force email check."] = "输入mailto:地址前为要求电子邮件检查。";
+$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "输入的简介地址属在这个网站使不可用的网络。";
+$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "有限的简介。这人不会接受直达／私人通信从您。";
+$a->strings["Unable to retrieve contact information."] = "不能取回熟人消息。";
+$a->strings["following"] = "关注";
+$a->strings["An invitation is required."] = "邀请必要的。";
+$a->strings["Invitation could not be verified."] = "不能证实邀请。";
+$a->strings["Invalid OpenID url"] = "无效的OpenID url";
+$a->strings["Please enter the required information."] = "请输入必要的信息。";
+$a->strings["Please use a shorter name."] = "请用短一点名。";
+$a->strings["Name too short."] = "名字太短。";
+$a->strings["That doesn't appear to be your full (First Last) name."] = "这看上去不是您的全姓名。";
+$a->strings["Your email domain is not among those allowed on this site."] = "这网站允许的域名中没有您的";
+$a->strings["Not a valid email address."] = "无效的邮件地址。";
+$a->strings["Cannot use that email."] = "不能用这个邮件地址。";
+$a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and must also begin with a letter."] = "您的昵称只能包含\"a-z\",\"0-9\",\"-\"和\"_\",还有头一字必须是拉丁字。";
+$a->strings["Nickname is already registered. Please choose another."] = "昵称已经报到。请选择新的。";
+$a->strings["Nickname was once registered here and may not be re-used. Please choose another."] = "昵称曾经这里注册于是不能再用。请选择别的。";
+$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "要紧错误：产生安全钥匙失败了。";
+$a->strings["An error occurred during registration. Please try again."] = "报到出了问题。请再试。";
+$a->strings["default"] = "默认";
+$a->strings["An error occurred creating your default profile. Please try again."] = "造成默认简介出了问题。请再试。";
+$a->strings["Profile Photos"] = "简介照片";
+$a->strings["Unknown | Not categorised"] = "未知的 ｜无分类";
+$a->strings["Block immediately"] = "立即拦";
+$a->strings["Shady, spammer, self-marketer"] = "可疑，发垃圾者，自市场开发者";
+$a->strings["Known to me, but no opinion"] = "我认识，但没有意见";
+$a->strings["OK, probably harmless"] = "行，大概无恶意的";
+$a->strings["Reputable, has my trust"] = "可信的，有我的信任";
+$a->strings["Frequently"] = "时常";
+$a->strings["Hourly"] = "每小时";
+$a->strings["Twice daily"] = "每日两次";
+$a->strings["Daily"] = "每日";
+$a->strings["Weekly"] = "每周";
+$a->strings["Monthly"] = "每月";
+$a->strings["Friendica"] = "Friendica";
+$a->strings["OStatus"] = "OStatus";
+$a->strings["RSS/Atom"] = "RSS/Atom";
+$a->strings["Email"] = "电子邮件";
+$a->strings["Diaspora"] = "Diaspora";
+$a->strings["Facebook"] = "Facebook";
+$a->strings["Zot!"] = "Zot!";
+$a->strings["LinkedIn"] = "LinkedIn";
+$a->strings["XMPP/IM"] = "XMPP/IM";
+$a->strings["MySpace"] = "MySpace";
+$a->strings["Google+"] = "Google+";
+$a->strings["Add New Contact"] = "增添新的熟人";
+$a->strings["Enter address or web location"] = "输入地址或网位置";
+$a->strings["Example: bob@example.com, http://example.com/barbara"] = "比如：li@example.com, http://example.com/li";
+$a->strings["Connect"] = "连接";
+$a->strings["%d invitation available"] = array(
+	0 => "%d邀请可用的",
+);
+$a->strings["Find People"] = "找人物";
+$a->strings["Enter name or interest"] = "输入名字或兴趣";
+$a->strings["Connect/Follow"] = "连接/关注";
+$a->strings["Examples: Robert Morgenstein, Fishing"] = "比如：李某，打鱼";
+$a->strings["Find"] = "搜索";
+$a->strings["Friend Suggestions"] = "友谊建议";
+$a->strings["Similar Interests"] = "相似兴趣";
+$a->strings["Random Profile"] = "随机简介";
+$a->strings["Invite Friends"] = "邀请朋友们";
+$a->strings["Networks"] = "网络";
+$a->strings["All Networks"] = "所有网络";
+$a->strings["Saved Folders"] = "保存的文件夹";
+$a->strings["Everything"] = "一切";
+$a->strings["Categories"] = "种类";
+$a->strings["%d contact in common"] = array(
+	0 => "%d共同熟人",
+);
+$a->strings["show more"] = "看多";
+$a->strings[" on Last.fm"] = "在Last.fm";
+$a->strings["view full size"] = "看全尺寸";
+$a->strings["Miscellaneous"] = "形形色色";
+$a->strings["year"] = "年";
+$a->strings["month"] = "月";
+$a->strings["day"] = "日";
+$a->strings["never"] = "从未";
+$a->strings["less than a second ago"] = "一秒以内";
+$a->strings["years"] = "年";
+$a->strings["months"] = "月";
+$a->strings["week"] = "星期";
+$a->strings["weeks"] = "星期";
+$a->strings["days"] = "天";
+$a->strings["hour"] = "小时";
+$a->strings["hours"] = "小时";
+$a->strings["minute"] = "分钟";
+$a->strings["minutes"] = "分钟";
+$a->strings["second"] = "秒";
+$a->strings["seconds"] = "秒";
+$a->strings["%1\$d %2\$s ago"] = "%1\$d %2\$s以前";
+$a->strings["%s's birthday"] = "%s的生日";
+$a->strings["Happy Birthday %s"] = "生日快乐%s";
+$a->strings["Click here to upgrade."] = "这里点击为更新。";
+$a->strings["This action exceeds the limits set by your subscription plan."] = "这个行动超过您订阅的限制。";
+$a->strings["This action is not available under your subscription plan."] = "这个行动在您的订阅不可用的。";
+$a->strings["(no subject)"] = "沒有题目";
+$a->strings["noreply"] = "noreply";
+$a->strings["%1\$s is now friends with %2\$s"] = "%1\$s是成为%2\$s的朋友";
+$a->strings["Sharing notification from Diaspora network"] = "分享通知从Diaspora网络";
+$a->strings["photo"] = "照片";
+$a->strings["status"] = "现状";
+$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s喜欢%2\$s的%3\$s";
+$a->strings["Attachments:"] = "附件：";
+$a->strings["[Name Withheld]"] = "[名字拒给]";
+$a->strings["A new person is sharing with you at "] = "一位新人给你分享在";
+$a->strings["You have a new follower at "] = "你有新的关注者在";
+$a->strings["Item not found."] = "项目找不到。";
+$a->strings["Do you really want to delete this item?"] = "您真的想删除这个项目吗？";
+$a->strings["Yes"] = "是";
+$a->strings["Cancel"] = "退消";
+$a->strings["Permission denied."] = "权限不够。";
+$a->strings["Archives"] = "档案";
+$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["Saved Searches"] = "保存的搜索";
+$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)"] = "使表示光网络文章在12小时内分页可用";
+$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["prev"] = "上个";
 $a->strings["first"] = "首先";
 $a->strings["last"] = "最后";
@@ -162,192 +337,18 @@ $a->strings["September"] = "九月";
 $a->strings["October"] = "十月";
 $a->strings["November"] = "十一月";
 $a->strings["December"] = "十二月";
+$a->strings["View Video"] = "看视频";
 $a->strings["bytes"] = "字节";
 $a->strings["Click to open/close"] = "点击为开关";
 $a->strings["link to source"] = "链接到来源";
-$a->strings["default"] = "默认";
 $a->strings["Select an alternate language"] = "选择别的语言";
 $a->strings["event"] = "项目";
-$a->strings["photo"] = "照片";
 $a->strings["activity"] = "活动";
 $a->strings["comment"] = array(
 	0 => "评论",
 );
 $a->strings["post"] = "文章";
 $a->strings["Item filed"] = "把项目归档了";
-$a->strings["Visible to everybody"] = "任何人可见的";
-$a->strings["show"] = "著";
-$a->strings["don't show"] = "别著";
-$a->strings["Logged out."] = "注销了";
-$a->strings["Login failed."] = "登记失败了。";
-$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "我们用您输入的OpenID登录的时候碰到问题。请核实拼法是对的。";
-$a->strings["The error message was:"] = "错误通知是：";
-$a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
-$a->strings["Starts:"] = "开始：";
-$a->strings["Finishes:"] = "结束：";
-$a->strings["Location:"] = "位置:";
-$a->strings["Disallowed profile URL."] = "不允许的简介地址.";
-$a->strings["Connect URL missing."] = "连接URL失踪的。";
-$a->strings["This site is not configured to allow communications with other networks."] = "这网站没配置允许跟别的网络交流.";
-$a->strings["No compatible communication protocols or feeds were discovered."] = "没有兼容协议或者摘要找到了.";
-$a->strings["The profile address specified does not provide adequate information."] = "输入的简介地址没有够消息。";
-$a->strings["An author or name was not found."] = "找不到作者或名。";
-$a->strings["No browser URL could be matched to this address."] = "这个地址没有符合什么游览器URL。";
-$a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "使不了知道的相配或邮件熟人相配 ";
-$a->strings["Use mailto: in front of address to force email check."] = "输入mailto:地址前为要求电子邮件检查。";
-$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "输入的简介地址属在这个网站使不可用的网络。";
-$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "有限的简介。这人不会接受直达／私人通信从您。";
-$a->strings["Unable to retrieve contact information."] = "不能取回熟人消息。";
-$a->strings["following"] = "关注";
-$a->strings["An invitation is required."] = "邀请必要的。";
-$a->strings["Invitation could not be verified."] = "不能证实邀请。";
-$a->strings["Invalid OpenID url"] = "无效的OpenID url";
-$a->strings["Please enter the required information."] = "请输入必要的信息。";
-$a->strings["Please use a shorter name."] = "请用短一点名。";
-$a->strings["Name too short."] = "名字太短。";
-$a->strings["That doesn't appear to be your full (First Last) name."] = "这看上去不是您的全姓名。";
-$a->strings["Your email domain is not among those allowed on this site."] = "这网站允许的域名中没有您的";
-$a->strings["Not a valid email address."] = "无效的邮件地址。";
-$a->strings["Cannot use that email."] = "不能用这个邮件地址。";
-$a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and must also begin with a letter."] = "您的昵称只能包含\"a-z\",\"0-9\",\"-\"和\"_\",还有头一字必须是拉丁字。";
-$a->strings["Nickname is already registered. Please choose another."] = "昵称已经报到。请选择新的。";
-$a->strings["Nickname was once registered here and may not be re-used. Please choose another."] = "昵称曾经这里注册于是不能再用。请选择别的。";
-$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "要紧错误：产生安全钥匙失败了。";
-$a->strings["An error occurred during registration. Please try again."] = "报到出了问题。请再试。";
-$a->strings["An error occurred creating your default profile. Please try again."] = "造成默认简介出了问题。请再试。";
-$a->strings["Profile Photos"] = "简介照片";
-$a->strings["Unknown | Not categorised"] = "未知的 ｜无分类";
-$a->strings["Block immediately"] = "立即拦";
-$a->strings["Shady, spammer, self-marketer"] = "可疑，发垃圾者，自市场开发者";
-$a->strings["Known to me, but no opinion"] = "我认识，但没有意见";
-$a->strings["OK, probably harmless"] = "行，大概无恶意的";
-$a->strings["Reputable, has my trust"] = "可信的，有我的信任";
-$a->strings["Frequently"] = "时常";
-$a->strings["Hourly"] = "每小时";
-$a->strings["Twice daily"] = "每日两次";
-$a->strings["Daily"] = "每日";
-$a->strings["Weekly"] = "每周";
-$a->strings["Monthly"] = "每月";
-$a->strings["Friendica"] = "Friendica";
-$a->strings["OStatus"] = "OStatus";
-$a->strings["RSS/Atom"] = "RSS/Atom";
-$a->strings["Email"] = "电子邮件";
-$a->strings["Diaspora"] = "Diaspora";
-$a->strings["Facebook"] = "Facebook";
-$a->strings["Zot!"] = "Zot!";
-$a->strings["LinkedIn"] = "LinkedIn";
-$a->strings["XMPP/IM"] = "XMPP/IM";
-$a->strings["MySpace"] = "MySpace";
-$a->strings["Google+"] = "Google+";
-$a->strings["Add New Contact"] = "增添新的熟人";
-$a->strings["Enter address or web location"] = "输入地址或网位置";
-$a->strings["Example: bob@example.com, http://example.com/barbara"] = "比如：li@example.com, http://example.com/li";
-$a->strings["Connect"] = "连接";
-$a->strings["%d invitation available"] = array(
-	0 => "%d邀请可用的",
-);
-$a->strings["Find People"] = "找人物";
-$a->strings["Enter name or interest"] = "输入名字或兴趣";
-$a->strings["Connect/Follow"] = "连接/关注";
-$a->strings["Examples: Robert Morgenstein, Fishing"] = "比如：李某，打鱼";
-$a->strings["Find"] = "搜索";
-$a->strings["Friend Suggestions"] = "友谊建议";
-$a->strings["Similar Interests"] = "相似兴趣";
-$a->strings["Random Profile"] = "随机简介";
-$a->strings["Invite Friends"] = "邀请朋友们";
-$a->strings["Networks"] = "网络";
-$a->strings["All Networks"] = "所有网络";
-$a->strings["Saved Folders"] = "保存的文件夹";
-$a->strings["Everything"] = "一切";
-$a->strings["Categories"] = "种类";
-$a->strings["%d contact in common"] = array(
-	0 => "%d共同熟人",
-);
-$a->strings["show more"] = "看多";
-$a->strings[" on Last.fm"] = "在Last.fm";
-$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 href=\"%s\" target=\"external-link\">%s</a>写了下面的<a href=\"%s\" target=\"external-link\">文章</a>";
-$a->strings["$1 wrote:"] = "$1写：";
-$a->strings["Encrypted content"] = "加密的内容";
-$a->strings["view full size"] = "看全尺寸";
-$a->strings["Miscellaneous"] = "形形色色";
-$a->strings["year"] = "年";
-$a->strings["month"] = "月";
-$a->strings["day"] = "日";
-$a->strings["never"] = "从未";
-$a->strings["less than a second ago"] = "一秒以内";
-$a->strings["years"] = "年";
-$a->strings["months"] = "月";
-$a->strings["week"] = "星期";
-$a->strings["weeks"] = "星期";
-$a->strings["days"] = "天";
-$a->strings["hour"] = "小时";
-$a->strings["hours"] = "小时";
-$a->strings["minute"] = "分钟";
-$a->strings["minutes"] = "分钟";
-$a->strings["second"] = "秒";
-$a->strings["seconds"] = "秒";
-$a->strings["%1\$d %2\$s ago"] = "%1\$d %2\$s以前";
-$a->strings["%s's birthday"] = "%s的生日";
-$a->strings["Happy Birthday %s"] = "生日快乐%s";
-$a->strings["Click here to upgrade."] = "这里点击为更新。";
-$a->strings["This action exceeds the limits set by your subscription plan."] = "这个行动超过您订阅的限制。";
-$a->strings["This action is not available under your subscription plan."] = "这个行动在您的订阅不可用的。";
-$a->strings["(no subject)"] = "沒有题目";
-$a->strings["noreply"] = "noreply";
-$a->strings["%1\$s is now friends with %2\$s"] = "%1\$s是成为%2\$s的朋友";
-$a->strings["Sharing notification from Diaspora network"] = "分享通知从Diaspora网络";
-$a->strings["status"] = "现状";
-$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s喜欢%2\$s的%3\$s";
-$a->strings["Attachments:"] = "附件：";
-$a->strings["[Name Withheld]"] = "[名字拒给]";
-$a->strings["A new person is sharing with you at "] = "一位新人给你分享在";
-$a->strings["You have a new follower at "] = "你有新的关注者在";
-$a->strings["Item not found."] = "项目找不到。";
-$a->strings["Do you really want to delete this item?"] = "您真的想删除这个项目吗？";
-$a->strings["Yes"] = "是";
-$a->strings["Cancel"] = "退消";
-$a->strings["Permission denied."] = "权限不够。";
-$a->strings["Archives"] = "档案";
-$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["Saved Searches"] = "保存的搜索";
-$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)"] = "使表示光网络文章在12小时内分页可用";
-$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["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "一个删除的组用这名被复兴。现有的项目权利<strong>可能</strong>还效为这个组和未来的成员。如果这不是您想的，请造成新组给起别的名。";
 $a->strings["Default privacy group for new contacts"] = "默认隐私组为新熟人";
 $a->strings["Everybody"] = "每人";
@@ -1173,6 +1174,11 @@ $a->strings["No suggestions available. If this is a new site, please try again i
 $a->strings["Ignore/Hide"] = "不理／隐藏";
 $a->strings["People Search"] = "搜索人物";
 $a->strings["No matches"] = "没有结果";
+$a->strings["No videos selected"] = "没选择的视频";
+$a->strings["Access to this item is restricted."] = "这个项目使用权限的。";
+$a->strings["View Album"] = "看照片册";
+$a->strings["Recent Videos"] = "最近视频";
+$a->strings["Upload New Videos"] = "上传新视频";
 $a->strings["Tag removed"] = "标签去除了";
 $a->strings["Remove Item Tag"] = "去除项目标签";
 $a->strings["Select a tag to remove: "] = "选择标签去除";
@@ -1392,7 +1398,6 @@ $a->strings["a photo"] = "一张照片";
 $a->strings["Image exceeds size limit of "] = "图片超出最大尺寸";
 $a->strings["Image file is empty."] = "图片文件空的。";
 $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."] = "您用%2$.2f兆字节的%1$.2f兆字节照片存储。";
 $a->strings["Upload Photos"] = "上传照片";
 $a->strings["New album name: "] = "新册名：";
@@ -1426,7 +1431,6 @@ $a->strings["I like this (toggle)"] = "我喜欢这(交替)";
 $a->strings["I don't like this (toggle)"] = "我不喜欢这(交替)";
 $a->strings["This is you"] = "这是你";
 $a->strings["Comment"] = "评论";
-$a->strings["View Album"] = "看照片册";
 $a->strings["Recent Photos"] = "最近的照片";
 $a->strings["Welcome to Friendica"] = "Friendica欢迎你";
 $a->strings["New Member Checklist"] = "新的成员一览表";
@@ -1463,7 +1467,7 @@ $a->strings["Go to the Help Section"] = "看帮助部分";
 $a->strings["Our <strong>help</strong> pages may be consulted for detail on other program features and resources."] = "我们<strong>帮助</strong>页可查阅到详情关于别的编程特点和资源。";
 $a->strings["Requested profile is not available."] = "要求的简介联系不上的。";
 $a->strings["Tips for New Members"] = "提示对新成员";
-$a->strings["Friendica Social Communications Server - Setup"] = "Friendica社会交通服务器－安装";
+$a->strings["Friendica Communications Server - Setup"] = "Friendica沟通服务器－安装";
 $a->strings["Could not connect to database."] = "解不了数据库。";
 $a->strings["Could not create table."] = "造成不了表格。";
 $a->strings["Your Friendica site database has been installed."] = "您Friendica网站数据库被安装了。";
@@ -1630,5 +1634,6 @@ $a->strings["Event Reminders"] = "事件提醒";
 $a->strings["Events this week:"] = "这周的事件:";
 $a->strings["Status Messages and Posts"] = "现状通知和文章";
 $a->strings["Profile Details"] = "简介内容";
+$a->strings["Videos"] = "视频";
 $a->strings["Events and Calendar"] = "项目和日历";
 $a->strings["Only You Can See This"] = "只您许看这个";
diff --git a/view/zh-cn/update_fail_eml.tpl b/view/zh-cn/update_fail_eml.tpl
index f68a3dece1..d52c175830 100644
--- a/view/zh-cn/update_fail_eml.tpl
+++ b/view/zh-cn/update_fail_eml.tpl
@@ -1,11 +1,11 @@
-Hey, 
-I'm $sitename.   
-The friendica developers released update $update recently, 
-but when I tried to install it, something went terribly wrong.  
-This needs to be fixed soon and I can't do it alone. Please contact a 
-friendica developer if you can not help me on your own. My database might be invalid. 
+你好， 
+我是$sitename；   
+Friendica开发者最近出版更新$update， 
+可我安装的时候，遇到什么灾害，  
+这要紧急地维修，可我不会自己做。请联系 
+一个Friendica开发者如果你不会自己帮我。我的数据库会不效。 
 
-The error message is '$error'.   
+错误通信是「$error」   
 
-I'm sorry, 
-your friendica server at $siteurl
\ No newline at end of file
+不好意思， 
+你Friendica服务器在$siteurl
\ No newline at end of file